| commit | c64b916ef56f5713bc1f7c3e496fdea9a846daf5 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 20 18:19:03 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 20 18:19:03 2010 -0700 |
| tree | 826a18bc8241683423585e7a00f0979f8135c6fd | |
| parent | f235a519398d47db1bbb8eb5e773565314b1fa4f [diff] | |
| parent | e7731f0a7f824add1fffa391965cbfeaf7cb2cf2 [diff] |
resolved conflicts for merge of e7731f0a to gingerbread-plus-aosp Change-Id: I8001a95f8c44ef0343e0a50de4bd5b5a85d41c38