commit | 01a0652f867b15b27b75d5cf68c5f9e9eb12b689 | [log] [tgz] |
---|---|---|
author | Tina Zhou <tinazh@google.com> | Fri Jan 20 21:26:48 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 20 21:26:48 2017 +0000 |
tree | dc6c3c7d0af4a14a20621d2f0ea8d019da4e6cc2 | |
parent | 01be4e8eae01a3570be8ae9f7f046f1d0aaead41 [diff] | |
parent | a0a1ce2a09e3371c0cc4a4ee7da9db1bf3f639f1 [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: 4c4a28cb3f -s ours am: a0a1ce2a09 Change-Id: Icdcc69c8a3fe7725c4d6f8a77b135fd1a37b3cdd