| commit | e495986d8cc4825d83014074d1948e8cb2f79ff1 | [log] [tgz] |
|---|---|---|
| author | tinazh <tinazh@google.com> | Mon Jul 17 21:11:34 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon Jul 17 21:11:34 2017 +0000 |
| tree | bbac2d122e31c5fb905a8f6b6875dbf272eab188 | |
| parent | 41448566af041a58798cbe099a1ba0d3b98461cc [diff] | |
| parent | 9c7e3582dba47454ee03fcc82658921a1bc57312 [diff] |
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 Change-Id: I67c24674f05802fa6fe87ea2bbd5f173a11302bb