tree e7051bb8bf97d3df1f470a81e5c38d855d133c75
parent d463f6e98011fe3b5a23cef2502705dedd702173
parent 7812920487070d392984f94c9f80006dad8c198a
author Elliott Hughes <enh@google.com> 1344464967 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344464967 -0700

am 78129204: Merge "Clean up the linker a bit, remove prelinking support."

* commit '7812920487070d392984f94c9f80006dad8c198a':
  Clean up the linker a bit, remove prelinking support.