tree c2ec87f3e659916be814b47fce515e8bd0c26887
parent 8deebb34d3207eaa70d1f4f30ed4c76773c34ea1
parent d0f81466e4e8e4179054a484cf6145efedfd7cb5
author Nick Kralevich <nnk@google.com> 1357932667 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357932667 -0800

am d0f81466: am 69c89942: Merge "Add stack canaries / strcpy tests."

* commit 'd0f81466e4e8e4179054a484cf6145efedfd7cb5':
  Add stack canaries / strcpy tests.