tree 38c1568c6db38f1f614384e06f0201acda1dbd53
parent 6d44e59c96fa491a60a67b585374b54e7a92e3ca
parent c48778ee31878c3239bbf85c485eac64e5a06b59
author Casey Dahlin <sadmac@google.com> 1441943425 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441943425 +0000

am c48778ee: am 6929b5fa: am c71fdabd: Merge "First pass on reentrant C++-ish parser"

* commit 'c48778ee31878c3239bbf85c485eac64e5a06b59':
  First pass on reentrant C++-ish parser