tree 05a10137d2c3c49a2e965ac7db3b488060f91745
parent 5e6d1dcfac43422a135b1540c4bb245bfe89b294
parent 150c05feeb482de2b4026fc35e392fc8c0ecd2df
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