Merge "Fix issues in the multiview tests"
authorChris Forbes <chrisforbes@google.com>
Mon, 5 Feb 2018 20:28:41 +0000 (20:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 5 Feb 2018 20:28:41 +0000 (20:28 +0000)
am: 887ba74d8b

Change-Id: I2bf3f5e8739bba60f4212e5664dedb193b8c1051


Trivial merge