| commit | 63155514a029c2e0763d1132ab8326bb4a6e8a3d | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Fri Dec 15 02:03:30 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 15 02:03:30 2017 +0000 |
| tree | 8e11b363e8bd61034b29b667f10f995e84fc3c7a | |
| parent | afe08c316691af85fb8e7cfc68f069a69a4b21d6 [diff] | |
| parent | 6268096bf4fbb1aff23f87b8f5570c2f7a8ca77d [diff] |
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 Change-Id: Ice13d1af6caf69c23bf0e55b037be5de589b3414