Commit 889cf929 authored by agowdra's avatar agowdra Committed by android-build-merger
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

Change-Id: I1f86307ed32ac69ccf84ec389d59120e48fa6d6e
parents 281e57bb d333a47e
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