| commit | 75d58127a06ba9efa1e8a8bd39394ebc3a8a43f4 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Fri Jan 20 21:28:10 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 20 21:28:10 2017 +0000 |
| tree | 0c0c75e0c9ca1c64d99d98a3c41a1252b250dc28 | |
| parent | 5783ce6c8264d1d653ab863733a74ab671403806 [diff] | |
| parent | dc5fb92ce6e84a55405de87d5876372db3d2d2f5 [diff] |
Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours" into nougat-cts-dev am: 021fddf3fe -s ours am: adb60043f2 am: dc5fb92ce6 Change-Id: I439f3ba88e4fbf86e953a0e6ce9a9cf4a9f30596