tree 6d8cdedfdb1bc071f891ca4736be28ac68d33cda
parent ba5f5fdd774223b3a801626cde014637e0fb04ec
parent 0afaf7f4dde98ff554b69d05ed87ceab4ec611aa
author Christopher Ferris <cferris@google.com> 1389134875 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389134875 -0800

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

* commit '0afaf7f4dde98ff554b69d05ed87ceab4ec611aa':
  Fix the ucontext for mips/x86.