Commit 57f1a2ad authored by Unsuk Jung's avatar Unsuk Jung Committed by Android Git Automerger
Browse files

am 7041bd27: resolved conflicts for merge of 36468a88 to jb-mr2-dev 

* commit '7041bd27':
  Fix minSDKVersion and bump CTS verifier to r6
parents 60c72a48 7041bd27
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