tree 5a9af767257d12acbaa7363d03facaf0d75b2936
parent ea8dcdcf64781ae83574bdad9e55cd78ea0e5d1d
parent 3352c5037526e1f5cd3291a4853c497e488b824c
author Elliott Hughes <enh@google.com> 1389747153 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389747153 -0800

am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace."

* commit '3352c5037526e1f5cd3291a4853c497e488b824c':
  Copy the bionic -fstack-protector hack into libbacktrace.