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

Change-Id: I02bacd54e7cf81592ad65890a7b4faab98ef16fd


Trivial merge