am d79de83b: (-s ours) am f16c6e17: Merge "Restore protection flags for ifunc during relocs."

* commit 'd79de83bfca0da705dbced60e0294f29da4aa63d':
This commit is contained in:
Elliott Hughes 2015-08-27 05:04:34 +00:00 committed by Android Git Automerger
commit 273292a11a

Diff Content Not Available