tree bc99bf57129f8b57914446e3be6dafdb44ca10ff
parent 03b2f79972307c5806794accad60384b4a35758d
parent 8c6fde5c85699d956d5d7469ffa949200abe151d
author Kane Ho <hkho@google.com> 1487120790 +0000
committer android-build-merger <android-build-merger@google.com> 1487120790 +0000

Merge "DO NOT MERGE Fixing layout of several test suites for round screens." into nougat-mr1-cts-dev am: baa6894eeb  -s ours
am: 8c6fde5c85

Change-Id: Iae57d610e20f7b5ae53ea0e6d55427f67955feae