| commit | e73e77e5ebd1e8c8476fee0de6ea19672d78cdc3 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Jun 02 18:53:03 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 02 18:53:03 2011 -0700 |
| tree | cb18f54c583a1906fff0f6b0515aab2b86bfc4d4 | |
| parent | 31e61185a6c34c8fd80c3283b9d80dc136b57b63 [diff] | |
| parent | 311f9493dfa88d455ff0ea25f86e508a6852682d [diff] |
am 311f9493: (-s ours) am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge. * commit '311f9493dfa88d455ff0ea25f86e508a6852682d': Merge 2402ad60 from honeycomb-mr1. do not merge.