commit | dbcdfb24a2886f779bdad788fcda7900539202e9 | [log] [tgz] |
---|---|---|
author | tinazh <tinazh@google.com> | Fri Jun 09 19:14:32 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 09 19:14:32 2017 +0000 |
tree | 62b871b5aa43de9d57b4cea2de1289c7e18b16fe | |
parent | 14a1751c542f049ad127f6b7f28bb7af7a4efe72 [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: Ie90f2f7acb73f8f3473da3d2786bb81342b7602d