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