tree 8cff7bdd218465331345d52947ca31450e8a93f6
parent 8c73f69cf42d78f37b9b82bf0cc62d2cd1985fcc
parent 3c9afb5e17eaa2ed5a12d71a1a09fe85f06fcb48
author Elliott Hughes <enh@google.com> 1363110056 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363110056 -0700

am 3c9afb5e: am 6b4c77f8: Merge "Use Elf32_Addr instead of unsigned in linker"

* commit '3c9afb5e17eaa2ed5a12d71a1a09fe85f06fcb48':
  Use Elf32_Addr instead of unsigned in linker