| commit | e341547e2931b4aae4681053491ba5ccbab06e6f | [log] [tgz] |
|---|---|---|
| author | Eric Laurent <elaurent@google.com> | Fri Mar 16 17:22:34 2012 -0700 |
| committer | Eric Laurent <elaurent@google.com> | Fri Mar 16 17:22:34 2012 -0700 |
| tree | 8ec033794cd34cfcf513f4bf6b50754c73bf881f | |
| parent | 51011e8de5a37b3912ab0c40e407b60e64a908ee [diff] | |
| parent | 9a55cd24e8b1175b604ba098e6b3a090591c93a3 [diff] |
resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp Change-Id: Ib6af53957780a09e59d663206b956a39fe883d6a