| commit | 28518391d14ba69fd9acd833e293b6c94920911c | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Mon Jul 26 12:21:19 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 26 12:21:19 2010 -0700 |
| tree | 6ac5b1840a855198fb3fba18b8d074f2f50997a8 | |
| parent | 6b9d2d6839fcb6f2049ae67214dbbc711fc399fd [diff] | |
| parent | 0291b0cada30c1c8eaaa346577969ff9b4eb5195 [diff] |
am 0291b0ca: resolved conflicts for merge of 6774809b to gingerbread-plus-aosp Merge commit '0291b0cada30c1c8eaaa346577969ff9b4eb5195' * commit '0291b0cada30c1c8eaaa346577969ff9b4eb5195': linker: Support dlopen(NULL, ...) properly.