tree f61a38f4b91cc2577e59af81b672aa64a49e35c1
parent bde69c05892945ccd130f6baf2555a2db669f811
parent c731a9a159f758e493179e892aa87f0679a66972
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1529018729 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1529018729 +0000

[automerger skipped] Merge "Merge "[automerger skipped] Merge "CTS testAspectRatio fail due to using Display.getRealMetrics" into nougat-mr1-cts-dev am: 108d19084d  -s ours" into oreo-cts-dev am: bd6ca5f8d2" into oreo-mr1-cts-dev am: a6798b6586 am: e2c306864e am: cfe7044905 skipped: c731a9a159

Change-Id: I9ba35f11436c3d5164310ea5a14c0e0b5b2a568a