| commit | 2b30e051b625df4b08ee520cd86c23919a9622f1 | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Mon Jan 17 14:17:12 2011 -0800 |
| committer | Eric Laurent <elaurent@google.com> | Mon Jan 17 14:17:12 2011 -0800 |
| tree | b9e50fb24e58cbbfe98c0667f25bb0c30d6cc49a | |
| parent | dc494e1e48b499ee1e56210fc82d3c489a6f5922 [diff] | |
| parent | adee6b3559b0260361305e57662ebcaed93ddeaa [diff] |
resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp Change-Id: I0d52f183f2a37b31b0d69c3846e94ea8d2cca09b