tree 6e00dddc84b1c664e9a12d217ecfd685fac94223
parent 6eeb61767d367258bb5709265769a3a931090529
parent 8a7cffc85dc4664a8bd7c3c526bfa56b25126864
author Nick Kralevich <nnk@google.com> 1403197924 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403197924 +0000

am 8a7cffc8: Merge "Reenable support for non-PIE executables"

* commit '8a7cffc85dc4664a8bd7c3c526bfa56b25126864':
  Reenable support for non-PIE executables