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

Change-Id: Id86ca067b795092009e6a7ffeeafe2555bcd78f3


Trivial merge