| commit | ce493c0349aa57571f6c9d4f4c88451508b8f16f | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Tue Aug 23 16:19:25 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 23 16:19:25 2011 -0700 |
| tree | 91aa93bbbb2f477b71f9ebd9d134b20f9d92abfe | |
| parent | f934fc02c4873047e29166df4193debcf905eef1 [diff] | |
| parent | 1c4e69f991d02244b261977a1ea1f028fa9dedd4 [diff] |
am 1c4e69f9: am 5eaacf66: (-s ours) am 9cf59510: Merge "CTS Version 2.3 R6" into gingerbread * commit '1c4e69f991d02244b261977a1ea1f028fa9dedd4': CTS Version 2.3 R6