tree 2875958cee218723552bd9151b4c514db3a4db48
parent 1858c2a2ebb9284dfbc3f2bcc52d9179d1d44a26
parent 1e424d8ef54c4056416d19b54ef016304c957fe1
author Christopher Ferris <cferris@google.com> 1389135022 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389135022 +0000

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

* commit '1e424d8ef54c4056416d19b54ef016304c957fe1':
  Fix the ucontext for mips/x86.