tree 200e7913525a81445e03c9bbd9e208f161d73556
parent 6ea342e842f509fa129bafc410392b6f279df3c4
parent 5fa0e1132e1052ce8248842ce42a8af0e1c0edb8
author Elliott Hughes <enh@google.com> 1398860245 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398860245 +0000

am 5fa0e113: am 32838ef8: am 02cb925c: Merge "Stop abusing KERNEL_HEADERS."

* commit '5fa0e1132e1052ce8248842ce42a8af0e1c0edb8':