| commit | 80cbc04389bdf6d591504639d711f95f1d55b1e4 | [log] [tgz] |
|---|---|---|
| author | Tina Zhou <tinazh@google.com> | Sat Jan 21 00:38:00 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jan 21 00:38:00 2017 +0000 |
| tree | af15c84aa7cf0bb35e8c45f8b1f6e95dade2ebf7 | |
| parent | fb6f70e89e9270fd33be109b830f80e0240c13fc [diff] | |
| parent | b3ce2d01f2cd0c9cdb63d71d2fc9fbde77a5e74d [diff] |
Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r15" into marshmallow-cts-dev am: 1d8c12aa80 -s ours" into nougat-cts-dev am: 021fddf3fe -s ours" into nougat-mr1-cts-dev am: c47bae4586 -s ours am: 3b49ee5110 am: b3ce2d01f2 Change-Id: Ie090328b05fc0bc7859b5d45e2e95e7e3dec787a