| commit | 0b12d1460254da6997c577a3acac5a928c6d41a8 | [log] [tgz] |
|---|---|---|
| author | Andreas Huber <andih@google.com> | Mon Nov 08 11:50:14 2010 -0800 |
| committer | Andreas Huber <andih@google.com> | Mon Nov 08 11:56:08 2010 -0800 |
| tree | 099de02f30b1ddb6f6ef7158b3c7abc060aaaa6f | |
| parent | 2bc35eb78ee222594b7ee5ce1fa3edbf0afc6ef4 [diff] | |
| parent | dca7b6fbd01afa0fe26925307d2c721439b3b63f [diff] |
resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f