tree bda8651902e365ba61fe80172b12330f7057da1a
parent d93df3321227b167bf68ead55adf76fc12ef8c60
parent 84b99aadddf3cd9d02a60b43923ed11fc7341c9f
author Christopher Ferris <cferris@google.com> 1387216677 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387216677 -0800

am 84b99aad: Merge "Enable uapi kernel headers for arm."

* commit '84b99aadddf3cd9d02a60b43923ed11fc7341c9f':
  Enable uapi kernel headers for arm.