tree cbb20ffbc37810289294674f567777d2564e9b5d
parent 4fda372228f0fae70941c24ae1469146e6e4226a
parent d4318f5daad7b85c2a3f23ac594636c5a824efae
author Christopher Ferris <cferris@google.com> 1383869590 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383869590 -0800

am d4318f5d: am 5b4dd471: Merge "Initial drop of uapi x86 headers."

* commit 'd4318f5daad7b85c2a3f23ac594636c5a824efae':
  Initial drop of uapi x86 headers.