| commit | dd25832d61ab4703614b21596a7599aaa8da3498 | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Fri Dec 15 02:21:07 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Dec 15 02:21:07 2017 +0000 |
| tree | 72bc72a7938954220dedf331e50c08e697772950 | |
| parent | f05f8f4ee6537f39bf382d741e4344e9b20bc15d [diff] | |
| parent | bdb6dd995a8730d776c472830d45417e4007e12a [diff] |
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 am: bdb6dd995a -s ours Change-Id: Iadd980805188c094db276d1f01b9d9ae3eca5252