| commit | b03966815581c367269f10dd2c832e8c4414c68d | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Nov 17 23:20:37 2009 -0800 |
| committer | Jim Miller <jaggies@google.com> | Tue Nov 17 23:20:37 2009 -0800 |
| tree | 770933f51ee3df528ab4a6574616b7705d8adb06 | |
| parent | 5a0db121c84b38b8b9711c3fc7e5f6c0b2fa5815 [diff] | |
| parent | ee3fd99a0ba0d0c3d969050454a07482259bcf0c [diff] |
resolved conflicts for merge of ee3fd99a to eclair-mr2-plus-aosp