tree cd989147d5b36fbda8ca413c698f1270eb429eb4
parent 914112ea21a62c7658dc4b094a369358009be6a9
parent 084be591923d3d509cea0a0f4b11b073e362d730
author Elliott Hughes <enh@google.com> 1351642684 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351642684 -0700

am 084be591: Merge "linker: handle R_ARM_COPY relocations in a proper way"

* commit '084be591923d3d509cea0a0f4b11b073e362d730':
  linker: handle R_ARM_COPY relocations in a proper way