tree 3c607bede48917dd11346fc9f4df71cea19dcf3e
parent 57a6fbfb9a6b662a9ac9bfa8bf500512340b2541
parent 7dee721eb3387fff695e5b5a3480428bccb3cf70
author Elliott Hughes <enh@google.com> 1389747647 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389747647 +0000

am 7dee721e: am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."

* commit '7dee721eb3387fff695e5b5a3480428bccb3cf70':
  Copy the bionic -fstack-protector hack into libbacktrace.