tree 93f4b6dc156f70ac024b694549194185df55e5ee
parent 5831a369566fa6a72cac8f4eda8206a6d79eb5c8
parent 32838ef838d1341aa8b77022869b801fb0bbb26c
author Elliott Hughes <enh@google.com> 1398819534 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398819534 +0000

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

* commit '32838ef838d1341aa8b77022869b801fb0bbb26c':