| commit | 5783ce6c8264d1d653ab863733a74ab671403806 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Fri Jan 20 21:27:14 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 20 21:27:14 2017 +0000 |
| tree | 0c0c75e0c9ca1c64d99d98a3c41a1252b250dc28 | |
| parent | e9146b71a63a64b11d0d2073bf68f86ec30737da [diff] | |
| parent | e86f75e926aaf823cd19bb642ddefe450fe8b349 [diff] |
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 am: 1795ae05dd am: e86f75e926 Change-Id: I9263143f4533c2bba741ab226a883a1872bf758b