Commit a1012aa7 authored by Android Merger's avatar Android Merger Committed by Gerrit Code Review
Browse files

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

Merge "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" into nougat-mr1-cts-dev
parents 35642c30 ba319f96
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