| commit | 66a5d695ed9268869ca50e304bfeabd2a021c6cd | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 25 17:27:16 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 25 17:27:16 2010 -0700 |
| tree | 1f8f0af3560c3408c4565499e8230ceda05cf758 | |
| parent | 41d21efd61157c9a4c49b2f7a6580ae0cbb58397 [diff] | |
| parent | b4ae2f1ba419212224d53db81c46ad242bebd17b [diff] |
resolved conflicts for merge of b4ae2f1b to gingerbread-plus-aosp Change-Id: I9d4e2649375d9262efe8aaade0778f638d04afa8