| commit | 08a65d2c5b75ac57428d7da718f3e2569f321d4c | [log] [tgz] |
|---|---|---|
| author | Eric Fischer <enf@google.com> | Fri Feb 18 15:33:33 2011 -0800 |
| committer | Eric Fischer <enf@google.com> | Fri Feb 18 15:33:33 2011 -0800 |
| tree | fb51844e6d8e53dcdfc920e6684092f87b14ef11 | |
| parent | 9fad3070fcc4ad45024246cf530dad996c92327e [diff] | |
| parent | 20c7965ddb40c6c3beaafefa24fad316dde9f75c [diff] |
resolved conflicts for merge of 20c7965d to gingerbread-plus-aosp Change-Id: I43d6738ed22048b6cb80330d2a6a8abc994110b0