Commit 193e9aef 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_r32" into marshmallow-cts-dev am: 18db382f  -s ours skipped: f54877ef skipped: da2d2b69 skipped: 2dc51e77

Change-Id: If0b8c196c0e5a08ccc72e7962be97552b176e2a6
parents 5c3653e4 2dc51e77
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