| commit | 1bb4261da35b5bc31c963b7ec5483338403093d6 | [log] [tgz] |
|---|---|---|
| author | Android Merger <noreply-android-build-merger@google.com> | Sat Jan 06 02:12:27 2018 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Jan 06 02:12:27 2018 +0000 |
| tree | 1382f15a48edb923b0470075ba253326718368fd | |
| parent | 7a9663324faf46b4b3a02e42251697c406afdfc9 [diff] | |
| parent | bea6b4131711c3c7d02b1828870a06ad6d041838 [diff] |
Merge "Merge "Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r25" into marshmallow-cts-dev am: 164b79d973 -s ours" into nougat-cts-dev am: a8b3fdfef9 -s ours am: dc444c5ed2 am: 6985745728 am: 13af8018cb am: fe6210b7bd am: 2b9d326bec -s ours am: c4e0e964de am: aca95f83c7 am: 7a29a8382c -s ours" am: bea6b41317 -s ours Change-Id: Id24fe69e01deac061f6b797d8d9bf608bc0d99b5