tree 5b34d26007517e060ece9014d44b7a67be48c93d
parent b8a5a597cd33e3ee8dcbc9edfe3908658851547b
parent d12ee620b064d262abce691771fe53ba8987d06f
author Christopher Ferris <cferris@google.com> 1387321918 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387321918 -0800

am d12ee620: Merge "Re-enable uapi kernel headers for arm."

* commit 'd12ee620b064d262abce691771fe53ba8987d06f':
  Re-enable uapi kernel headers for arm.