| commit | 5e610d6ad6f3461722e0291b980f521a413fa05e | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 20 17:30:45 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 20 17:30:45 2010 -0700 |
| tree | ec0da09e85c000609e80b94f63c859f37d027d50 | |
| parent | 3691181b21454bcd56c9521e8b61d96ed6e01f84 [diff] | |
| parent | b01a043df41e987321f6c01930ac306befb1d3dc [diff] |
resolved conflicts for merge of b01a043d to gingerbread-plus-aosp Change-Id: I60466613c7ea0335a78d553a10876367d65557d9