| commit | 37273ff37050e8f1d34aada6a9ff14e5996e53dc | [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 | ccd32ebd35cda1e4521b6c3383a10955620f9e7e | |
| parent | 0bbbdb23c36a6ef37882f3e8435241922fdb8bbc [diff] | |
| parent | e0dae0b496b155dce182c1f79e03b1d68e032ab6 [diff] |
resolved conflicts for merge of 691be97f to gingerbread-plus-aosp Change-Id: Ic095e7f9203eb1465ddf3c195ebf1200e9393124