tree c481b6ef5d18dc032744db07e2f89c5cb3627464
parent 847ad9002dbd0d78dd3b4d966765b9485a058ec3
parent ed1fb12040792126936d32e93183c66310a22c94
author Andrew Hsieh <andrewhsieh@google.com> 1429503810 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429503810 +0000

am ed1fb120: Merge "[MIPS,MIPS64] Cherry-pick asm/reg.h file from bionic"

* commit 'ed1fb12040792126936d32e93183c66310a22c94':
  [MIPS,MIPS64] Cherry-pick asm/reg.h file from bionic