Commit 1b66e2e4 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_r28" into marshmallow-cts-dev
am: 13405161  -s ours

Change-Id: Ifc072c17aad8ea59f50dacb83bfb242a9ecbbc25
parents 2589d1e0 13405161
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