tree afc8a5f72f0f7162e30d2469c200f5a5e7eab085
parent 6e7926a6cdd5fa6815266ecb16d6ba5410f8a182
parent 6f9b7562e36483a7bf23833d99da6a50e57f7266
author David Turner <digit@android.com> 1303838664 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1303838664 -0700

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

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