| commit | 8059bcbfa71c8233e616304843d9280f5f1615bb | [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 | 945545ee86c1c9dbed0c8942279de87c8fb74593 | |
| parent | 22186a2c15cc752cfaaf8a12d415a3c097d338e0 [diff] | |
| parent | 1162fd77a8ff8467c96204c00bcaf941aef6aa85 [diff] |
resolved conflicts for merge of 1162fd77 to eclair-mr2