commit | 51f8b1fbfb6eb1ffa91fc5b53549005a121fa1c4 | [log] [tgz] |
---|---|---|
author | Unsuk Jung <unsuk@google.com> | Fri Jun 27 13:26:14 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 27 13:26:14 2014 +0000 |
tree | a83f0e355dfb206804adddf83617f82f747526ba | |
parent | ae4ed7caa392db84ec505bfecc7d40fa49659051 [diff] | |
parent | b42a26cef0c86b74e5217469323e574cb8015360 [diff] |
am b42a26ce: am d5f2d13d: 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 'b42a26cef0c86b74e5217469323e574cb8015360': DO NOT MERGE Bump CTS versions