| commit | 1bff79f90ffc5014db47ec1342e0cafecd6802e0 | [log] [tgz] |
|---|---|---|
| author | tinazh <tinazh@google.com> | Fri Jun 09 19:16:42 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Jun 09 19:16:42 2017 +0000 |
| tree | 316319439e86bd87d44215c0d00693c068b89d7f | |
| parent | 4a8e84979b9ce8532ea02f7afedf96aca874a823 [diff] | |
| parent | 851299d7cd6398694e825b4d4edb770e66ea03b6 [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 Change-Id: I00a718b3d984ac0f61c65b6ec5e8e87382f31f65