Merge "Fix implicit conversion to bool"
authorCollin Baker <collinbaker@google.com>
Wed, 10 Aug 2016 22:00:54 +0000 (22:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 10 Aug 2016 22:00:54 +0000 (22:00 +0000)
am: 95d03db971

Change-Id: I054bd6977be912399032876723be543bf5b65dcf


Trivial merge