| commit | 934b8ca57bb5d45d28450c12af3a5c765ba51c12 | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Wed Nov 18 17:52:10 2009 -0800 |
| committer | Xavier Ducrohet <xav@android.com> | Wed Nov 18 17:52:10 2009 -0800 |
| tree | 37803487db7ec94e028b8c29449179ce775b5405 | |
| parent | 1c563caad4700be1be5eec2dab6d13b3dcd34e51 [diff] | |
| parent | 8915fd90cf07dc3c2b711200714e9ae4f76a612c [diff] |
resolved conflicts for merge of 8915fd90 to eclair-mr2-plus-aosp