tree 18b07cf87ba5be3dbdb6ebf1ecd5562ad31fd963
parent 80d877d6c343fbbb1eff21f4ddf7aa56dc33cbd4
parent 8ad9909a70c4925a1da15ce150835e436f54d8c1
author Nick Kralevich <nnk@google.com> 1404417581 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404417581 +0000

am 8ad9909a: am d11ca4e8: Merge "Revert "Reenable support for non-PIE executables""

* commit '8ad9909a70c4925a1da15ce150835e436f54d8c1':
  Revert "Reenable support for non-PIE executables"