tree 05a10137d2c3c49a2e965ac7db3b488060f91745
parent 3080909fa87a1a19767d3f808f75b0df36ea2822
parent 6fbee9b5cb67e3a0898a295550e639f9af4ea86d
author Lee Campbell <leecam@google.com> 1438381922 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438381922 +0000

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

* commit '150c05feeb482de2b4026fc35e392fc8c0ecd2df':
  init: Adding header guard to tokenizer