| commit | cc21582fb3699e5384dc38dad45a575451375d1a | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Nov 19 10:58:11 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Nov 19 10:58:11 2010 -0800 |
| tree | 7d074f9120317899d10389d38bbb0cc1945f9e0a | |
| parent | f41934fcd42c56a02742014e8e24520a85166117 [diff] | |
| parent | 4130c80aa3c7ec6e192f99e9cce4918b4b3c804d [diff] |
resolved conflicts for merge of 4130c80a to gingerbread-plus-aosp Change-Id: I4c37c4a6a54c3fb005eec4789bfcf96678d8cec9