| commit | 628a6c66dbe363b8229beb2a31e55940f616ae26 | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Wed Apr 30 19:22:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 19:22:33 2014 +0000 |
| tree | f79b9cea6f7a7df461d8ef6f98b7b989788c8c1d | |
| parent | 54dba7c9ed69c0049b4a260d129f305655b3540e [diff] | |
| parent | 2474a2293564993a2dff2b5c5d7d7ad23ac6af9f [diff] |
am 2474a229: am 2e6a8f70: am dd646c42: am 72f2612b: am 8887857a: am 11ed135a: am d83a1552: am 5bc6a50e: Merge commit \'d6c4d47c\' into manualmerge2 * commit '2474a2293564993a2dff2b5c5d7d7ad23ac6af9f': Bumping jb cts and cts verifier version.