Merge changes from topic "multiview"
authorPhilip Rideout <prideout@google.com>
Tue, 16 Jan 2018 20:05:39 +0000 (20:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Jan 2018 20:05:39 +0000 (20:05 +0000)
commit07c43c795876408ecdb8d66d93880e29ea0700ba
tree8b2b76a49c6116ab20a7cdcede303388cbb99a08
parent08a2f69984651416f5ae8b8697acf44aac3530ab
parentcbc74ae174e3c3332eb2a972e4de01233d178498
Merge changes from topic "multiview"
am: cbc74ae174

Change-Id: I1a1e3f85f1d8373ec30ce0c1fbb1c5f726ba5223