| commit | 1a0b19b324eb6631333dcc51d9b92c3b1ead2eac | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 07:41:59 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Tue Aug 17 07:41:59 2010 -0700 |
| tree | 4e82de541c627aaa85c354e70e791bf0a5bab0d3 | |
| parent | 264348361e0660948a09fe516a535b7c60998def [diff] | |
| parent | bcbb584569873a60acac3c733a9e81374447ea8c [diff] |
resolved conflicts for merge of bcbb5845 to gingerbread-plus-aosp Change-Id: I04fb94c91958bcba3e587a8bf523c551d964f761