| commit | 9641a9db84c969b8ae53d6463e89038295b1585a | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Mon Jun 04 16:06:48 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 04 16:06:48 2012 -0700 |
| tree | 29b1b0ba1d21240d53edaca5344af71434491a68 | |
| parent | 0afb21224907c1bbc3f6584111c23e6b3ec5a96b [diff] | |
| parent | c4f1f8d8fc9205fe4918288fc9fd9828cecab2ff [diff] |
am c4f1f8d8: (-s ours) am 4b830c07: Merge "DO NOT MERGE Set CTS and CtsVerifier to 4.1_r1" into jb-dev * commit 'c4f1f8d8fc9205fe4918288fc9fd9828cecab2ff': DO NOT MERGE Set CTS and CtsVerifier to 4.1_r1