tree 780215c53a835637499bb3ff461c36ed26a6ff1d
parent 828c006a171845db03782f217ae1908b361afcc4
parent 0ba207590421e014a1c80fd9fb87b34f25bbf410
author MinSeong Kim <minseong.kim@linaro.org> 1473182694 +0000
committer android-build-merger <android-build-merger@google.com> 1473182694 +0000

Merge "Fix "Unknown token error" when upstream clang is used." am: bfad958982 am: d2b7e91119 am: 7f08b7350b
am: 0ba2075904

Change-Id: I32082cc97514dfd5fe9f8c307b85b47629eb0b01