| commit | 5883bdba4ed33382ac5bd97ed51de20486475b6d | [log] [tgz] |
|---|---|---|
| author | tinazh <tinazh@google.com> | Tue Jul 18 18:27:03 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Jul 18 18:27:03 2017 +0000 |
| tree | 47af1faf1c3e91175265dbfaa3764cbf32d9bea0 | |
| parent | 46eed8db955ac3546818957442d421ade8bd3be1 [diff] | |
| parent | 2f61f989559907d9d0db5c1b05d7c0da8616bb35 [diff] |
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours am: c20243add0 am: e58ba61773 am: b5aa45badd am: 63e50972e3 -s ours am: f668643b4d am: 2f61f98955 Change-Id: I3bdf5be33eb89781151575d64c25b3ddb8e247ef