commit | 44944f2714ad98e6b3c9e7d387837845288b4a18 | [log] [tgz] |
---|---|---|
author | agowdra <agowdra@google.com> | Fri Jul 13 14:37:33 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 13 14:37:33 2018 -0700 |
tree | 0fcdfbc893e182490ac440366097640db148b240 | |
parent | cd4800ed2b836d2b3fdc3fc4bb7f7ffba48125bd [diff] | |
parent | e562b7d80c85fd6bf318d30552611f22cb79d678 [diff] |
Merge "Merge "Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r31" into marshmallow-cts-dev am: d333a47e1f -s ours" into nougat-cts-dev am: 5f2cdbfbb1 -s ours" into nougat-mr1-cts-dev am: e090519020 -s ours" into oreo-cts-dev am: d931fafeb4 -s ours am: 6a32006610 am: f9c41bfb47 am: e562b7d80c -s ours Change-Id: I09c5657e5dad58131d11734e1816cb785d511cc6