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