tree c43f9b230542dc8977592384ba71e94ccc03289c
parent 57f226256659eca3cf06233d74761ca9c37d51b2
parent 4a8996fb42d2114fee344b75acb23d5b0e9c548d
author Elliott Hughes <enh@google.com> 1389747300 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389747300 +0000

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

* commit '4a8996fb42d2114fee344b75acb23d5b0e9c548d':
  Copy the bionic -fstack-protector hack into libbacktrace.