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