| commit | 8484e57f3006dd3aa925792e6414387c233c1a8d | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 22 16:32:34 2010 -0800 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Nov 22 16:32:34 2010 -0800 |
| tree | 99abad315a9d51f33c54b6ca961c88fed096cc75 | |
| parent | 6bdd69370fe2bda7adc7055f62165fccd944b192 [diff] | |
| parent | e4ae7fc3eb6776881d1707483d3f0c93443040d4 [diff] |
resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8