| commit | 1ff04d8e567c03f697d99027e64ea31f5043fba7 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue May 24 02:57:31 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue May 24 02:57:31 2011 -0700 |
| tree | 9a5c708514e448d5bf392088930e496a04b77d6d | |
| parent | 690a9bb8ade4d5639cbdbd1120e29e280819cdca [diff] | |
| parent | ea182704b60551a9bd7760aa9d206ca7a7e407b8 [diff] |
am ea182704: (-s ours) am 041fd74b: (-s ours) am f791863f: Merge "Merge 05b7b69c from honeycomb-mr1. do not merge." into gingerbread * commit 'ea182704b60551a9bd7760aa9d206ca7a7e407b8': Merge 05b7b69c from honeycomb-mr1. do not merge.