| commit | 44e43d1f6593ae912b3818692058196233cd4ac9 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 11 11:51:31 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 11 11:51:31 2010 -0700 |
| tree | e67a660f2f1ec8cc00f5717f767029cbddcd7f54 | |
| parent | a6c28cb014c32b9522c41385075c9db77296f6e7 [diff] | |
| parent | efcac2ffba6262829093c4388c35f93b0ba0510e [diff] |
resolved conflicts for merge of efcac2ff to gingerbread-plus-aosp Change-Id: Id6bd5ab1d6eda0372f2fd8eecb8f1d204066c4d5