| commit | 6b88aeab3b879bcb419c2ecbe33cec2923f2206c | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Fri Jan 20 21:27:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 20 21:27:18 2017 +0000 |
| tree | dc6c3c7d0af4a14a20621d2f0ea8d019da4e6cc2 | |
| parent | 01a0652f867b15b27b75d5cf68c5f9e9eb12b689 [diff] | |
| parent | 6c12095322379effe400c51030631619d2f2a4f3 [diff] |
Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: 7f203e5d1f -s ours" into nougat-mr1-cts-dev am: 342133f9b7 -s ours am: 6c12095322 Change-Id: Iaeaba49310ca04db249e360537924afe812ca43a