tree ca19a15bac15467dfda89572e654edbebdacb8a3
parent cc42a2d6f45ca74d64994908e8483c446b734036
parent 83b97a6a267a4ed9806191277289870156b2c372
author Dan Bornstein <danfuzz@android.com> 1273107113 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273107113 -0700

am 83b97a6a: am 458f0633: For issue #2651381, allow library prelinking.

Merge commit '83b97a6a267a4ed9806191277289870156b2c372' into kraken

* commit '83b97a6a267a4ed9806191277289870156b2c372':
  For issue #2651381, allow library prelinking.