tree ee99a5cfdd743ae700e234a7fcf0a69442c4df3f
parent adb14248ea2a0e60a5a8bb0ff1adac2fde2a3c46
parent 2e9a8b3eb3835bfdb809c0e0f420e43ace7e3a35
author Jean-Baptiste Queru <jbq@google.com> 1297294289 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297294289 -0800

am 2e9a8b3e: (-s ours) Merge "disable prelinking - do not merge"

* commit '2e9a8b3eb3835bfdb809c0e0f420e43ace7e3a35':
  disable prelinking - do not merge