| commit | 9dec45d73931341fe54708c9d5690b21c07b6f84 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Wed Oct 02 12:28:06 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 02 12:28:06 2013 -0700 |
| tree | d67ea93f659244ffa6b2b43a1f0bd2f47576f154 | |
| parent | 8d2c047d74ccb55360631858ede5d40284eb2f36 [diff] | |
| parent | 57f1a2ad116797b68901ab426d3f95f27fb5fa34 [diff] |
am 57f1a2ad: am 7041bd27: resolved conflicts for merge of 36468a88 to jb-mr2-dev * commit '57f1a2ad116797b68901ab426d3f95f27fb5fa34': Fix minSDKVersion and bump CTS verifier to r6