Commit ba319f96 authored by agowdra's avatar agowdra Committed by android-build-merger
Browse files

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

Merge "[automerger skipped] Merge "DO NOT MERGE: Bump CTS and CTS Verifier to 6.0_r32" into marshmallow-cts-dev am: 18db382f  -s ours" into nougat-cts-dev
am: 5ac82de7  -s ours

Change-Id: If757d150ea0e29d18f344ca3e5a9bf8a7fca1178
parents 35642c30 5ac82de7
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