tree 83ba4c9d779fb2a8a0ca9096049782f65fe8b536
parent 3d5617487c07f1fcbdf23755e0ca01559e3c5f3b
parent 0f91887868e51de67bdf9aedc97fbcb044dc1969
author Lee Campbell <leecam@google.com> 1438379567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438379567 +0000

am 0f918878: Merge "init: Adding header guard to tokenizer"

* commit '0f91887868e51de67bdf9aedc97fbcb044dc1969':
  init: Adding header guard to tokenizer