| commit | 9dd85837e3947f373bf8a8debe0f59535c643892 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue May 24 02:57:37 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 24 02:57:37 2011 -0700 |
| tree | 9a5c708514e448d5bf392088930e496a04b77d6d | |
| parent | 1ff04d8e567c03f697d99027e64ea31f5043fba7 [diff] | |
| parent | 46e802e9c12befcd477e59437c5de3f0889aef4e [diff] |
am 46e802e9: (-s ours) am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. * commit '46e802e9c12befcd477e59437c5de3f0889aef4e': Merge e57aa434 from honeycomb-mr1. do not merge.