tree b50561952c6b84490618cf73d5e291bb490fe597
parent 1c75422c2144b845412b20c100e3a13cf2704212
parent 7957529d4419fa92928daebfdc5f5bb1ee50120a
author Christopher Ferris <cferris@google.com> 1391170635 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391170635 +0000

am 7957529d: Merge "Clean up UnwindCurrent.cpp\'s use of ucontext.h."

* commit '7957529d4419fa92928daebfdc5f5bb1ee50120a':
  Clean up UnwindCurrent.cpp's use of ucontext.h.