tree 31e697374e1e1f9724013aac5bb261718fb00a48
parent f0e1e33fdc2467baf46573ce50bd6c521ff32f6c
parent e7c6e1dea54a8ec02e8e0bc71593e5dd25b83cf2
author Ben Cheng <bccheng@google.com> 1383869590 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383869590 -0800

am e7c6e1de: am 1df0ee55: Merge "Initial drop of uapi arm headers."

* commit 'e7c6e1dea54a8ec02e8e0bc71593e5dd25b83cf2':
  Initial drop of uapi arm headers.