tree 2eae8787fc07820491f8cc336d26fb9cc73f25fe
parent 55a461c9b1ab92bf6250650afcacc8de85c1e01a
parent d5565942437e2c0787822604921d034e9df5fc5d
author David Turner <digit@android.com> 1303805523 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303805523 -0700

am d5565942: Merge "x86: Disable stack-protector until bionic is fixed"

* commit 'd5565942437e2c0787822604921d034e9df5fc5d':
  x86: Disable stack-protector until bionic is fixed