| commit | 28130baefb4fa6d1e0ff9c92337295ba74461cf7 | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Fri Aug 27 12:08:40 2010 -0700 |
| committer | Brad Fitzpatrick <bradfitz@android.com> | Fri Aug 27 12:08:40 2010 -0700 |
| tree | 21c870a702d64402a8fa503353b82ae21bb50bee | |
| parent | dfad42760f3c9c3b8439ff4b365256474471abe4 [diff] | |
| parent | 6b50986a6b64fa3cbe4d527137134cd14d0ad6bd [diff] |
resolved conflicts for merge of 6b50986a to gingerbread-plus-aosp Change-Id: I7c5ec7ae717e75ad242e2c1ad4537052e4eea718