commit | e562b7d80c85fd6bf318d30552611f22cb79d678 | [log] [tgz] |
---|---|---|
author | agowdra <agowdra@google.com> | Fri Jul 13 14:26:35 2018 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 13 14:26:35 2018 -0700 |
tree | 1e4bb6beddd198b1f5d618416e2d139daa55783a | |
parent | 4e5138859545fd66893ffccf2ff26c89074d4cb7 [diff] | |
parent | f9c41bfb47631ab8a14bf3fd30bcc7bc7009ab84 [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 Change-Id: I96868c4fcef2dbcf51532d60f740bfe244d5aac2