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

Change-Id: I4df45579084f5830c943770e757a800255c1545b


Trivial merge