tree 1a553d388189768675f2e3b4929603226c2ca233
parent f1597e9e4ab87c0078dd6d24e7b93bcca0c21fcf
author John Glassmyer <jogl@google.com> 1426701529 -0700
committer Sergey Prigogin <eclipse.sprigogin@gmail.com> 1450840356 -0800

Resolve grammar ambiguities which resulted in ANTLR errors and warnings

Change-Id: I5a942ced046b461cab52272d88f2c66f4f031026