Commit 138104d1 authored by Unsuk Jung's avatar Unsuk Jung Committed by Android Git Automerger
Browse files

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

* commit '9dec45d7':
  Fix minSDKVersion and bump CTS verifier to r6
parents a5b3c549 9dec45d7
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