tree bf79b152f3276ae34fc3846f8f78d02dc47836b8
parent b0e40722f4397fadf6f1b4014e45766f82cacd03
parent 0298da56f410ba0f6a1f1f44deb8e2224f9fc49d
author Christopher Ferris <cferris@google.com> 1389138798 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389138798 +0000

am 0298da56: am 492b0ca4: am 1e424d8e: am 0afaf7f4: Merge "Fix the ucontext for mips/x86."

* commit '0298da56f410ba0f6a1f1f44deb8e2224f9fc49d':
  Fix the ucontext for mips/x86.