| commit | 0460e26a4c9915f77c915d2cc3540969802b02fa | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 20 17:16:37 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 20 17:16:37 2010 -0700 |
| tree | 07e81d722979a30813b646b54ac17c56a4b20952 | |
| parent | d90348796829f3d3a443e73ea3b3f2f9e79071c2 [diff] | |
| parent | 691be97f1640e52b99ce9905fe854f27eeeed62c [diff] |
resolved conflicts for merge of 691be97f to gingerbread-plus-aosp Change-Id: Ic095e7f9203eb1465ddf3c195ebf1200e9393124