| commit | 46e802e9c12befcd477e59437c5de3f0889aef4e | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Mon May 23 10:22:00 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 23 10:22:00 2011 -0700 |
| tree | 662e6a15ff9d526ed70163eee15d41cdd9360f45 | |
| parent | ea182704b60551a9bd7760aa9d206ca7a7e407b8 [diff] | |
| parent | 5b9ec6871afaf40325abe602cd1d29ddbd88cbb9 [diff] |
am 5b9ec687: (-s ours) am 4c1e73b6: Merge e57aa434 from honeycomb-mr1. do not merge. * commit '5b9ec6871afaf40325abe602cd1d29ddbd88cbb9': Merge e57aa434 from honeycomb-mr1. do not merge.