tree f3d5c389d127864af4d46deff23f7634a9926c9e
parent b2a32cb99099b705578f40d1ba509bd48db140af
parent 63b2c577526d0c7ae4e90e54bf0f0befb0294456
author Elliott Hughes <enh@google.com> 1344459860 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344459860 -0700

am 63b2c577: Merge "Conditionally use SIGSTKFLT"

* commit '63b2c577526d0c7ae4e90e54bf0f0befb0294456':
  Conditionally use SIGSTKFLT