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)
commit4bdc401b1f5c0845917992ea98acc2fae641f484
treec096be5670bb03c2527a3f37fcbf653e3c971cf3
parent8c45816a407df6b892f7300a266465fe93dbbc9d
parent8dff83a942fa042dba14f04bf4b73df139eadc0d
Merge "Fix implicit conversion to bool" am: 95d03db971 am: 5c51a0e9ab
am: 8dff83a942

Change-Id: I9bcb746b1c5d904312e8e8f7720f074757f0d7ee