| commit | 3baff73198ce852fa60080bd32703028298b4d65 | [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 | 91c41492bf470b1a3facc7da5b3dad6d97ffbd6c | |
| parent | 4974d5eaf838d893c418b85bd47f6f114d9b5aaa [diff] | |
| parent | 85d9b4225d024bb0d602b48bd6d5219cbebd7b8e [diff] |
resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f