Merge changes from topic "multiview" am: cbc74ae174
authorPhilip Rideout <prideout@google.com>
Tue, 16 Jan 2018 20:27:14 +0000 (20:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 16 Jan 2018 20:27:14 +0000 (20:27 +0000)
commit72882cd389cf5a1771785ed6798bc1b70650a628
treea1ac66df34c817df24ca824b11e976eca422748f
parentaaafd67b5b22145c35e3111f96d4d248f52d09ed
parent07c43c795876408ecdb8d66d93880e29ea0700ba
Merge changes from topic "multiview" am: cbc74ae174
am: 07c43c7958

Change-Id: I759d4531a2cb66cd0888cc4f38c2597157144b71