commit | df4731c84e2684cc7be8e7a25032b56f30ca22cf | [log] [tgz] |
---|---|---|
author | Android Merger <noreply-android-build-merger@google.com> | Fri Jan 05 20:41:32 2018 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jan 05 20:41:32 2018 +0000 |
tree | fea27b42c0e39acc4d11abf109c5eb8b938450ac | |
parent | e04aab93b99fc8bd831aca73d9921eca8a3ab60f [diff] | |
parent | b9751ebfc8f20c2619f78a2e809320283dcca213 [diff] |
Merge "Merge "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" into nougat-mr1-cts-dev am: e90c42e63a -s ours" into oreo-cts-dev am: 3c0cdbc0ac -s ours am: 3b3315e00c am: f360d28744 am: fc86ef9e80 -s ours"