tree c61ed6b94871903d94d6b7998ee425a77767f6d3
parent 1b4252cd0312695827529f2a8470b68e5a5c05e2
parent e57c8446f0fa8e02b27e0b77aee7a2b62784cc54
author Elliott Hughes <enh@google.com> 1384910184 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384910184 -0800

am e57c8446: Merge "Switch x86 to uapi headers."

* commit 'e57c8446f0fa8e02b27e0b77aee7a2b62784cc54':
  Switch x86 to uapi headers.