am f16c6e17: Merge "Restore protection flags for ifunc during relocs."

* commit 'f16c6e17b22c278320d0e662d1f1e1213f8fbc71':
  Restore protection flags for ifunc during relocs.
This commit is contained in:
Elliott Hughes 2015-07-27 22:01:48 +00:00 committed by Android Git Automerger
commit d79de83bfc

Diff Content Not Available