tree 9ee0a81ff9db4852dac15cf02ecd44bfe775b158
parent ac395b8799034bcadcb25990719cb5e54f9bf08a
parent 3973ad4e5dbe20eb86faf4b022296555f7184ee0
author Android Merger <noreply-android-build-merger@google.com> 1513304031 +0000
committer android-build-merger <android-build-merger@google.com> 1513304031 +0000

Merge "Merge "Merge "DO NOT MERGE: cherry-pick from the android o(cts) to fix the the magnification test" into nougat-mr1-cts-dev am: 2e8aa2f2ce  -s ours" into oreo-cts-dev am: 6268096bf4  -s ours" am: 4fe43661c2  -s ours
am: 3973ad4e5d

Change-Id: Ic6b761ae72cc82df10c9e8ee8ddb14496b1819d7