| commit | 81434ee171bb9989a0565082fc41a301a285b2f8 | [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 | 29672e361f7c6f3e6cc4db311b837f040101a649 | |
| parent | dc35d6e36679f11a11ffb70416d0b0fd04303ad8 [diff] | |
| parent | b3e3837febbf3a036173066f406536393672a32b [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.