tree 49f57bcaf3b44517d26137499cf864b44ff49938
parent 672ab2a395cab392e5781d0551df8ae485db0f4a
parent a4c42802df0e2245a6915e9a850a0ad10f35225c
author Andrew Hsieh <andrewhsieh@google.com> 1333352637 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1333352637 -0700

am a4c42802: am 3211c04a: Merge "ndk: arm: Update <asm/ptrace.h> and <asm/user.h>"

* commit 'a4c42802df0e2245a6915e9a850a0ad10f35225c':
  ndk: arm: Update <asm/ptrace.h> and <asm/user.h>