tree ea40b42ebea8dfa43a40218cfb100e324a8fa221
parent 214feeba196435d26b4b8ba6ca6959695ebb892c
parent fa136e8ca71cb20956cd1792251869cac8bed257
author Andrew Hsieh <andrewhsieh@google.com> 1340244055 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1340244055 -0700

am fa136e8c: am a5948157: Merge "Define __stack_chk_fail_local.S"

* commit 'fa136e8ca71cb20956cd1792251869cac8bed257':
  Define __stack_chk_fail_local.S