tree e51f3e33803326d5b8954def1841f07f1a0723ba
parent f78964490d8098387d51444c87bf520ad3f674e2
parent 2d315667ab733375d8c696f8c2f155bc1de9e4a2
author Dan Bornstein <danfuzz@android.com> 1273107028 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273107028 -0700

am 2d315667: For issue #2651381, allow library prelinking.

Merge commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2' into froyo-plus-aosp

* commit '2d315667ab733375d8c696f8c2f155bc1de9e4a2':
  For issue #2651381, allow library prelinking.