| commit | e2d20aa1ab5de52ee4a4f5ba3cffcc1166a0b44f | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Tue Nov 03 17:01:08 2009 -0800 |
| committer | Jeff Sharkey <jsharkey@android.com> | Tue Nov 03 17:01:08 2009 -0800 |
| tree | c15e62bc6fe5a76efd3a214764ca49b3597084b7 | |
| parent | b4e61e064b59e8076df81b061add9fb358fd2ed9 [diff] | |
| parent | bf6a7e4dece49ba4e7cda17f7ed9250aeb82f731 [diff] |
resolved conflicts for merge of bf6a7e4d to eclair-mr2