| commit | 077e5b6a721c606c339d88de11ba640225a8e39f | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 20 17:16:37 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Aug 20 17:16:37 2010 -0700 |
| tree | 85f48fd8e5576feecb15939f81e6af4bbe1942fc | |
| parent | d3f1b287248e929511550e273895ba282a80ded8 [diff] | |
| parent | 5dda1d924543904009ab73c30f3f8b8d6a57c204 [diff] |
resolved conflicts for merge of 691be97f to gingerbread-plus-aosp Change-Id: Ic095e7f9203eb1465ddf3c195ebf1200e9393124