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

Change-Id: I9bcb746b1c5d904312e8e8f7720f074757f0d7ee


Trivial merge