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)
commit8dff83a942fa042dba14f04bf4b73df139eadc0d
treec096be5670bb03c2527a3f37fcbf653e3c971cf3
parentc62f0007f68c658f5e8171d5e505ab64630e812e
parent5c51a0e9ab0f1cd692d3380b74a764dae03b19bb
Merge "Fix implicit conversion to bool" am: 95d03db971
am: 5c51a0e9ab

Change-Id: Id86ca067b795092009e6a7ffeeafe2555bcd78f3