Commit 540a7777 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role)
Browse files

[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to... 

[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r31" into marshmallow-cts-dev am: d333a47e  -s ours skipped: 889cf929 skipped: cf805a54 skipped: 5f90a282

Change-Id: Idb6209d1575b0b9e0850347ef977b86e4f916e8d
parents 9b97bfe6 5f90a282
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment