Merge "Fix implicit conversion to bool"
authorTreehugger Robot <treehugger-gerrit@google.com>
Wed, 10 Aug 2016 21:54:31 +0000 (21:54 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Wed, 10 Aug 2016 21:54:31 +0000 (21:54 +0000)

Trivial merge