| commit | 66282a6a092f8466bc3dddf24663c58b112455d3 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 23 14:14:07 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 23 14:15:01 2010 -0700 |
| tree | 83d1eb96c1b64e1b68daa8fb84d7ff61e633acb1 | |
| parent | 39877265553ee566c51b557666f3979133d5701f [diff] | |
| parent | 410d0ea5a4b7a2d27755bbee24b9a8aed7a6097e [diff] |
resolved conflicts for merge of a9b1e01a to gingerbread-plus-aosp Change-Id: Ief79eaa532b583d9608701d48464b7afdc493bac