| commit | 833ead24e207c3fc07cd9772fb6c423efcefaaa5 | [log] [tgz] |
|---|---|---|
| author | tinazh <tinazh@google.com> | Mon Jul 17 21:04:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 17 21:04:57 2017 +0000 |
| tree | a088f49ef96827f96995cda19df557d43d7203a5 | |
| parent | d54e51d44023e95db8705d1363097680ee073d6c [diff] | |
| parent | 9c7e3582dba47454ee03fcc82658921a1bc57312 [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 Change-Id: If03df3647b8645262c09c18baeda3a13f4302e0f