| commit | 3eb9f8326e6d72be671bf0226965ca3231a25d7d | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Tue Jun 07 15:09:39 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 07 15:09:39 2011 -0700 |
| tree | ddc2c6aeb57081564399f9a69b6432033300967c | |
| parent | e1d14a29ff9aa17923dc4e9406408cbc07a97c31 [diff] | |
| parent | 67f09cd090adae6365ca36546b0a517e51255876 [diff] |
am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread * commit '67f09cd090adae6365ca36546b0a517e51255876': Cherrypick d1ed33c4 from hc-mr1. do not merge.