tree d04992b65e4bde436ab6be6c00c90e2a863f4146
parent 29a44c1ee62c33668e17425a304ff10c3b93de88
author Delphine Martin <delphinemartin@google.com> 1444895381 +0200
committer Delphine Martin <delphinemartin@google.com> 1446719897 +0100

Fixed two bugs with the KeepModifier with shrob.

- When using two rules with potential modifiers, make sure
  that the modifier variable was reset to NONE.
- Modifier should not be an enum since more than one modifier
  could be used.

Bug: 25413316
Bug: 25413069

(cherry picked from commit b5b9f53e94d5e3eb3fe3a5ff7d33664e2512de0c)

Change-Id: I6d6e373a98fc43653c661187ffafec48c3f0dddd