| commit | 8f652ffd0385de0b00bea90c0d64ceaf6f450be9 | [log] [tgz] |
|---|---|---|
| author | tinazh <tinazh@google.com> | Mon Jul 17 21:28:06 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 17 21:28:06 2017 +0000 |
| tree | 1030a82659ca15eabf0d8b357fbd8139f01f6cef | |
| parent | 489e28f44be4fa3fca4227934e8797ef77c77004 [diff] | |
| parent | b7d7f41dcb9b1f51865d8f1df48c01e536ce449a [diff] |
Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r21" into marshmallow-cts-dev am: fb2e015eaa -s ours" into nougat-cts-dev am: 9c7e3582db -s ours am: e495986d8c am: b7d7f41dcb Change-Id: I7914e32aecb5beb5f696ed06d8be47e9969e34a1