| commit | 59e699f13db9a32f30108e25577685bb39b3dae4 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Sun May 29 09:00:16 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun May 29 09:00:16 2011 -0700 |
| tree | 6dc4adba0b1af2275895cc24beb516b08cb9d038 | |
| parent | 311f9493dfa88d455ff0ea25f86e508a6852682d [diff] | |
| parent | 228e4716278f450a95be5addacc3c6c940668493 [diff] |
am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge. * commit '228e4716278f450a95be5addacc3c6c940668493': Merge 6103e22c from honeycomb-mr1. do not merge.