| commit | eb09f2612b48c4efa607a96d6e49829f78db4dc1 | [log] [tgz] |
|---|---|---|
| author | tinazh <tinazh@google.com> | Mon Jul 17 21:43:59 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 17 21:43:59 2017 +0000 |
| tree | e3434b26a9e8a8b1f43d4bbaf6192e27d3d8a74b | |
| parent | 24f0e8e028893be1afff02e01b4f4e4e3f054010 [diff] | |
| parent | 85a518df8997b22819af8bab086a1d349733db97 [diff] |
Merge "Merge "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" into nougat-mr1-cts-dev am: 2dfc77ddf4 -s ours" am: 25dcd90191 -s ours am: 534b823f45 -s ours am: 9019d5bd46 am: 85a518df89 Change-Id: I1247a06523ab69c49ed7bcbf557ec8cf9f499719