Commit 2dc51e77 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

Change-Id: I5c00d87fd23d0198abce1bcc84b2d61af5af3f73
parents ede0bdd5 da2d2b69
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