tree c6b97ca91da98c52d0b72170cdf83e3e33397ef9
parent 27484f2e740950e5b6260b7c3e086f98f019317b
parent 0e74cfb677319c0f006dcc81f74fb21956807d2a
author Elliott Hughes <enh@google.com> 1418685591 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418685591 +0000

am 0e74cfb6: Merge "Fix references to HAVE_PRCTL."

* commit '0e74cfb677319c0f006dcc81f74fb21956807d2a':
  Fix references to HAVE_PRCTL.