tree 4b031465e9458335febf2ed2f98f2a18bb0ceb6f
parent 5d62931244716a6ed1007efb795c01f3a3c15a70
parent d488ffe953df119c8f0c5d65ca03502561c1b962
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1529012417 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1529012417 +0000

[automerger skipped] Merge "CTS testAspectRatio fail due to using Display.getRealMetrics" into nougat-mr1-cts-dev am: 108d19084d  -s ours skipped: d488ffe953

Change-Id: If55f8d27662e43bb1bcd5d05cda026b7a12e61e2