tree e2338bdba7ac973faf0b53f687dad39dd048bc47
parent d6ffb0ae6d8ebe371491abf4a03689c5b0b5fa79
parent a8a66a4e1972f2abf315ea3e3abe6a9413cf703b
author Christopher Ferris <cferris@google.com> 1387567104 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387567104 +0000

am a8a66a4e: am 3356457a: am 9092f8fb: Merge "Use uapi kernel headers."

* commit 'a8a66a4e1972f2abf315ea3e3abe6a9413cf703b':
  Use uapi kernel headers.