OSDN Git Service

am 0291b0ca: resolved conflicts for merge of 6774809b to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Mon, 26 Jul 2010 19:21:19 +0000 (12:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 26 Jul 2010 19:21:19 +0000 (12:21 -0700)
commit28518391d14ba69fd9acd833e293b6c94920911c
tree6ac5b1840a855198fb3fba18b8d074f2f50997a8
parent6b9d2d6839fcb6f2049ae67214dbbc711fc399fd
parent0291b0cada30c1c8eaaa346577969ff9b4eb5195
am 0291b0ca: resolved conflicts for merge of 6774809b to gingerbread-plus-aosp

Merge commit '0291b0cada30c1c8eaaa346577969ff9b4eb5195'

* commit '0291b0cada30c1c8eaaa346577969ff9b4eb5195':
  linker: Support dlopen(NULL, ...) properly.