commit | f413ea75ee14c57bddafe8d606d3648193b633e3 | [log] [tgz] |
---|---|---|
author | Brian Muramatsu <btmura@android.com> | Thu Dec 20 14:02:30 2012 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 20 14:02:30 2012 -0800 |
tree | b50d852e35460972ffe35f307b4b75f739dd1784 | |
parent | 31abdce9fec3cf4b064cd716aa5872f280ee20af [diff] | |
parent | 56d1212edd7b28df08d41f09403d723ac524b049 [diff] |
am 56d1212e: (-s ours) am ed0c32dd: am 5cb152dd: am 3477c93b: (-s ours) am d2cdc11d: am 58deb9cb: (-s ours) Merge "DO NOT MERGE Update CTS Verifier Version to 4.1_R3" into jb-dev * commit '56d1212edd7b28df08d41f09403d723ac524b049': DO NOT MERGE Update CTS Verifier Version to 4.1_R3