Commit 5f90a282 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_r31" into marshmallow-cts-dev am: d333a47e  -s ours skipped: 889cf929 skipped: cf805a54

Change-Id: Ic12dc8fa4ce08c2c38f7b4d7c0bc8946b8e4e5da
parents 1838b604 cf805a54
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