tree 1d184f03a6780f2693dd59fdcb5e13c1e81a33e9
parent aa57dd608a9e4bf529656e3532f655419a50f312
parent 666882945b850acbe82d03671eed13c481d580bd
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1529129386 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1529129386 +0000

[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r30" into marshmallow-cts-dev am: e7d20373d1  -s ours skipped: d284d16382 skipped: 666882945b

Change-Id: Ia4c0e0a1df2219e82ab215c76d54ab8fadd5976a