tree 2743ffc42bc710a5514af18f8c6826b93e2fd805
parent 37d0e13ad3be7fddbce991bef263ac4375e28c22
parent 6929b5fab007281d3c35deec905feb8fdc506a31
author Casey Dahlin <sadmac@google.com> 1441936549 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441936549 +0000

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

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