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)
commit20d96f559bdcf2b2ca718a8211628399b376cf34
treec096be5670bb03c2527a3f37fcbf653e3c971cf3
parentbd35fe0f97b59e51e372266caf2c4e6a46514630
parent4bdc401b1f5c0845917992ea98acc2fae641f484
Merge "Fix implicit conversion to bool" am: 95d03db971 am: 5c51a0e9ab am: 8dff83a942
am: 4bdc401b1f

Change-Id: I4477e73cd9feeef1207e19c3e9b043bd2f53511f