tree f3f9b5bc96aa97b59c58b88bcae930abba59682f
parent 21ec5bd3f88a2e7b20f75067b68ae547146853b3
parent 801f558c85ee5c224a03e3456a6dbdb217051164
author Dan Bornstein <danfuzz@android.com> 1273107022 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273107022 -0700

am 801f558c: For issue #2651381, allow library prelinking.

Merge commit '801f558c85ee5c224a03e3456a6dbdb217051164' into froyo-plus-aosp

* commit '801f558c85ee5c224a03e3456a6dbdb217051164':
  For issue #2651381, allow library prelinking.