| commit | f7e5a69fe6f141f571289a1f3cbef231da463d65 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Wed Apr 30 19:17:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 19:17:31 2014 +0000 |
| tree | fe6a918198402735662d9cb24bdd41063deded7e | |
| parent | 2474a2293564993a2dff2b5c5d7d7ad23ac6af9f [diff] | |
| parent | 01702644052ac0a04d36fa23385b2b718185aae3 [diff] |
am 01702644: am 5152dd8a: am 07fa5825: am a3bea87f: am a96e13d9: am 7066fee3: am 7aaea0f4: Merge commit \'862e0fe2\' into manualmerge2 * commit '01702644052ac0a04d36fa23385b2b718185aae3': Too much merging. Revert "Bumping jb cts and cts verifier version."