commit | fdfad5354a0e7b3803696ce4f6f811a62308807a | [log] [tgz] |
---|---|---|
author | Tina Zhou <tinazh@google.com> | Fri Jan 20 21:36:02 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jan 20 21:36:02 2017 +0000 |
tree | 0c0c75e0c9ca1c64d99d98a3c41a1252b250dc28 | |
parent | 23de3af5b0b2ca406006091d84a9c4ea1cc41ff0 [diff] | |
parent | 0e91dd76bebc675455e1ec0a7e747d12fc9ad44d [diff] |
Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours am: fad5398de5 am: cf2a6021d6 am: 5fe7870a08 am: 226ad6dc44 -s ours am: 12a6380740 am: 0e91dd76be Change-Id: I0163100ffbec1fc6ac610dd73881e2a0b996651a