tree ae3bb0f4c3bfe2b3bc8499c8d5600632818c7267
parent fe68d087531cbb7cd55edb303254049150d7cd29
parent 43b0b1854ccc33cd2feb7f0340736dcc89a0b99b
author Christopher Ferris <cferris@google.com> 1383869595 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383869595 -0800

am 43b0b185: am 1cfb884b: Merge "Initial drop of uapi mips headers."

* commit '43b0b1854ccc33cd2feb7f0340736dcc89a0b99b':
  Initial drop of uapi mips headers.