| commit | 7066fee3adc2d6567cc15fdffd86123326b3bb7a | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Wed Apr 30 18:19:48 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 18:19:48 2014 +0000 |
| tree | 2bda3a0ca2f9da6aca643235f2b9b7b42bf25f11 | |
| parent | d83a1552efaaf6dc1ea0fd1b31332e7c54a7bef8 [diff] | |
| parent | 7aaea0f4d53e7c92c37cf0e7b66a02be52dd9729 [diff] |
am 7aaea0f4: Merge commit \'862e0fe2\' into manualmerge2 * commit '7aaea0f4d53e7c92c37cf0e7b66a02be52dd9729': Too much merging. Revert "Bumping jb cts and cts verifier version."