| commit | 074870af30d89522285788bcfb1faecc42a479b4 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Mon Nov 16 14:49:07 2009 -0800 |
| committer | Jeff Sharkey <jsharkey@android.com> | Mon Nov 16 14:49:07 2009 -0800 |
| tree | 2be5aacbe410439b4a1d5ce6fff5c769c2e6680c | |
| parent | 9e805b46726d170311aed36028cfdc6849a68bba [diff] | |
| parent | f1ca2089d2c49725c0712394b62da824ff5dfcc8 [diff] |
resolved conflicts for merge of 1162fd77 to eclair-mr2