| commit | d5f2d13dedef39e70d5c1f68a37f1ced58c09ba0 | [log] [tgz] |
|---|---|---|
| author | Unsuk Jung <unsuk@google.com> | Fri Jun 27 13:16:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 27 13:16:36 2014 +0000 |
| tree | 67facd163bdbaadc1cd29bf425127ff312c8c036 | |
| parent | 200eb0e48b50d1eb42fc1b961e04343d78f38d3e [diff] | |
| parent | 6d4e316c157803f743dd09d5e881e269a3bcd105 [diff] |
am 6d4e316c: (-s ours) am a59e033c: am 5d22b0a2: (-s ours) am 8db6afd6: am d847d26c: am f4b2abf6: am 76ea4407: am 05e9f39e: am fee8a29f: (-s ours) Merge "DO NOT MERGE Bump CTS versions" into jb-dev * commit '6d4e316c157803f743dd09d5e881e269a3bcd105': DO NOT MERGE Bump CTS versions