Commit 1aaae1a6 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_r32" into marshmallow-cts-dev
am: 18db382f  -s ours

Change-Id: Ied52f27f7c47ec8863117f63287099abc6d02eac
parents cb56018a 18db382f
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