tree df365d6114eb17903e3b36d1580e04bd018e983e
parent 27ff1ae414915789b27d0a485ff6d856ae742aad
parent 8d01c0557bb2b7ea30f4038b6c84b816800073a7
author Nick Kralevich <nnk@google.com> 1358373355 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358373355 -0800

am 8d01c055: am 1271cdc1: Merge "Revert "stack protector: use AT_RANDOM""

* commit '8d01c0557bb2b7ea30f4038b6c84b816800073a7':
  Revert "stack protector: use AT_RANDOM"