Commit da2d2b69 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

Change-Id: I5f109f75c71472d9d1d5b497cefe13bdb1fa737e
parents 9e798002 f54877ef
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