tree 3b3cbdcf52d9bbb22d1bd8d51c02843ba529c8d4
parent fdef55a46eec6f9bef7b49bf2daca49828397a44
parent c54863d5d4ff3667e30f859e2d0273e4bb2c4d0f
author Dan Bornstein <danfuzz@android.com> 1273175011 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273175011 -0700

am c54863d5: For issue #2651381, allow library prelinking.

Merge commit 'c54863d5d4ff3667e30f859e2d0273e4bb2c4d0f' into kraken

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