| commit | 6eba882d8346f54775d561810f4632550cab826e | [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 | 716ef087ac59b90cff170eb97f989198a904a5a9 | |
| parent | b4dab551916c45e30854e3520dbaa3fcf0ad13f7 [diff] | |
| parent | 9a994a0796b9afefca7a93a6900684cc65ef6818 [diff] |
resolved conflicts for merge of 64591009 to gingerbread-plus-aosp Change-Id: Id9ebca9993f97a79cb2a6c41a7566d473ccc5b7e