| commit | 0b423bd591701939af70b2b67f1fa91dad907e9b | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Jun 02 18:53:17 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 02 18:53:17 2011 -0700 |
| tree | cb18f54c583a1906fff0f6b0515aab2b86bfc4d4 | |
| parent | e73e77e5ebd1e8c8476fee0de6ea19672d78cdc3 [diff] | |
| parent | 59e699f13db9a32f30108e25577685bb39b3dae4 [diff] |
am 59e699f1: (-s ours) am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge. * commit '59e699f13db9a32f30108e25577685bb39b3dae4': Merge 6103e22c from honeycomb-mr1. do not merge.