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

Change-Id: I4477e73cd9feeef1207e19c3e9b043bd2f53511f


Trivial merge