tree 628db577dbaf3c7b0aeae97d0108aa5ee4facc61
parent fc4d9263a3f291c3e9d82cc00ecbf5c4c769c6fd
parent 0d4437263e65b7acc4546753ac79577b94ccc6ba
author Elliott Hughes <enh@google.com> 1398965766 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398965766 +0000

am 0d443726: am d2623501: am 8979cfe1: Merge "Keep the kernel header scrubber\'s data structures in sync."

* commit '0d4437263e65b7acc4546753ac79577b94ccc6ba':
  Keep the kernel header scrubber's data structures in sync.