commit | 05809eb72adaaaefae2d8e897623288e9ce504af | [log] [tgz] |
---|---|---|
author | Android Build Merger (Role) <android-build-merger@google.com> | Fri Jun 09 19:27:48 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jun 09 19:27:52 2017 +0000 |
tree | ca2e52d6431d49f30224cd0abc34eed56d996969 | |
parent | 1eb653418c3a7491be862344fe8a22ef54e9f29a [diff] | |
parent | 93a982d98b8576132503c48b82edf9b0333ff46f [diff] |
Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r20" into marshmallow-cts-dev am: 34c68a07e2 -s ours am: 09e0424548 am: 0b3b5dccc6 am: 4b90a0a01e am: ff39a57d19 -s ours am: 0b1bbe3edc am: 975a7c4275 am: 00b57deea7 am: c2e0b37663 am: f6cb521189 -s ours am: 0f230de217" into oc-dev-plus-aosp am: 4a8e84979b" into oc-dr1-dev-plus-aosp