tree b3f21093c03991196087abcec479697d8fc658e3
parent 39720af97a34e9ba549234c0ce3d75d3e526b2a8
parent 7ccd822d1b56bcace157534ff9b5e0551e278908
author Andrew Hsieh <andrewhsieh@google.com> 1363362198 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363362198 -0700

am 7ccd822d: am e6915e0e: Merge "Fix X86 sigsetjmp and siglongjmp"

* commit '7ccd822d1b56bcace157534ff9b5e0551e278908':
  Fix X86 sigsetjmp and siglongjmp