tree 332e59c6f6092b172b71d5430000a412019b0bdb
parent f5537739295f2e5595fe8bb8fd6dc0928dd94d64
parent 5842cf219648f543b757ccd3250ec884098bc463
author Android Merger <noreply-android-build-merger@google.com> 1531440254 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1531440254 +0000

Merge "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" into oreo-mr1-cts-dev