tree b804863dce6d10ac8be5d9dd8c5077f075d1d94e
parent 958d241f1f10523da56e018772acd3c2441a9701
parent 02cb925ca99b6fe98f687cfa7d332158c045f441
author Elliott Hughes <enh@google.com> 1394561788 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394561788 +0000

am 02cb925c: Merge "Stop abusing KERNEL_HEADERS."

* commit '02cb925ca99b6fe98f687cfa7d332158c045f441':
  Stop abusing KERNEL_HEADERS.