| commit | 6c12095322379effe400c51030631619d2f2a4f3 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Fri Jan 20 21:19:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jan 20 21:19:46 2017 +0000 |
| tree | 4b1a2d42581bd1eb7a38b5c9edb79deff91198ab | |
| parent | a0a1ce2a09e3371c0cc4a4ee7da9db1bf3f639f1 [diff] | |
| parent | 342133f9b7c80eedc56629b44d59471ccd9c7817 [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 Change-Id: Iae7192f0f5cb36cc997f1044ecc8638dac869da3