tree d7c3e611cd1d0b66845cb48757309c77db0e95c1
parent 560750ede55038358569feab1265b7e2915f9998
parent e090519020183d8bf7a627e4ef209d82bb22101e
author agowdra <agowdra@google.com> 1531439021 -0700
committer android-build-merger <android-build-merger@google.com> 1531439021 -0700

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

Change-Id: I5468b2f1bc309d641eda3a824fd483a039df3273