| commit | 3b07ecf527357ed72abaad5ecd261d7d901adf21 | [log] [tgz] |
|---|---|---|
| author | tinazh <tinazh@google.com> | Fri Jun 09 19:28:12 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 09 19:28:12 2017 +0000 |
| tree | ca2e52d6431d49f30224cd0abc34eed56d996969 | |
| parent | 93a982d98b8576132503c48b82edf9b0333ff46f [diff] | |
| parent | 1bff79f90ffc5014db47ec1342e0cafecd6802e0 [diff] |
Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 5.1_r21" into lollipop-mr1-cts-dev am: 3cf482f1aa -s ours" into marshmallow-cts-dev am: 2fe51274db -s ours am: 034b4fe6b3 am: c905e844e1 am: 6ffd506feb am: e14e19968b -s ours am: 86932477bb am: 2056de0f29 am: 065e20ae8c am: c4a2d29821 am: 9ee582f644 -s ours am: 851299d7cd am: 1bff79f90f Change-Id: Ife7de7531d2bfd92a328fb76661c8da50d8cbca0