tree c760a1c2c3909c2473a370ebb5a8eced601bf053
parent 1271ef1d193abf567937ab57edf19913f5800166
parent 5725f3197b98021df10ce3655cddecb7c118baaa
author David 'Digit' Turner <digit@android.com> 1350480576 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350480576 -0700

am 5725f319: Merge "Android ucontext refinements (upstream backport)."

* commit '5725f3197b98021df10ce3655cddecb7c118baaa':
  Android ucontext refinements (upstream backport).