tree 8d05d222cfd3cba9e5bec43b57bf8c2812a4121b
parent b0af7e5107abb17fc756044454b3a452d0dafb50
parent 34cf868be4c7da1e58324051b968021742727692
author Ben Cheng <bccheng@google.com> 1382123243 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382123243 -0700

am 34cf868b: Merge "Point to the uapi header location for aarch64."

* commit '34cf868be4c7da1e58324051b968021742727692':
  Point to the uapi header location for aarch64.