| commit | 8f461e5cc2972ed5054469b92bc841c07a50b7cf | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Nov 24 08:41:31 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Wed Nov 24 08:41:41 2010 -0800 |
| tree | e6182215df37b7ed9e8e3413210c37fb568d570e | |
| parent | 720fdebb4ca2306133099126eb1f10b0b79ccce1 [diff] | |
| parent | 1a15cb7e904a562b0120039816fce5b8e6d5b147 [diff] |
resolved conflicts for merge of 1a15cb7e to gingerbread-plus-aosp Change-Id: I6468f995c29c6e05f4cb89bedb02cff2ff4bac61