| commit | b1657b2bd6aea0c22b48e2cdd25dcc57581a3f3d | [log] [tgz] |
|---|---|---|
| author | Brad Fitzpatrick <bradfitz@android.com> | Tue Sep 07 21:41:09 2010 -0700 |
| committer | Brad Fitzpatrick <bradfitz@android.com> | Tue Sep 07 21:41:09 2010 -0700 |
| tree | 33e8328d5f86dc202f1f4cfc74651aece1d28a67 | |
| parent | f870ee81089ddf5e0388f8b4c7b6a1d437d39ce0 [diff] | |
| parent | 64591009409618ee67e71c4b345cac50ad0e4e31 [diff] |
resolved conflicts for merge of 64591009 to gingerbread-plus-aosp Change-Id: Id9ebca9993f97a79cb2a6c41a7566d473ccc5b7e