| commit | 81833f30599f2ec027a043e1225aaf2cb1ad5d73 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Tue Oct 05 16:00:13 2010 -0400 |
| committer | Mike Lockwood <lockwood@android.com> | Tue Oct 05 16:00:13 2010 -0400 |
| tree | 98068ff36940ccebbfd23dc2bf49dbcfbcde2c09 | |
| parent | ef03f5a047d75fb7b1c32182e4d065e6f9ebef78 [diff] | |
| parent | 5bf21bce370f95001db1fe0910d53e19c9f99fe1 [diff] |
resolved conflicts for merge of 2f65a99f to gingerbread-plus-aosp Change-Id: I9830756577dc6a64b03bc2be8788986d9034b059