| commit | 82775ae0acf7cac647c057c80fbcc7f13d0554d3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Oct 15 12:52:21 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Oct 15 12:52:21 2010 -0700 |
| tree | 4e09b0b6e200010ba9a69bd9c3f0c9025ebf1f81 | |
| parent | 5c485373563c1183db2ba02ec2aca695d1c87cc8 [diff] | |
| parent | 347db52a1d9e607fe55e8e5441c238fc2500c3fb [diff] |
resolved conflicts for merge of 347db52a to gingerbread-plus-aosp Change-Id: I706a5158e781cbbc00344a72badca1543bcbca15