Merge "Fix implicit conversion to bool" am: 95d03db971 am: 5c51a0e9ab am: 8dff83a942...
authorCollin Baker <collinbaker@google.com>
Tue, 22 Aug 2017 17:39:34 +0000 (17:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 22 Aug 2017 17:39:34 +0000 (17:39 +0000)
am: 20d96f559b

Change-Id: Ic742f8a8b1f5acb7344f1ed869eb5fe8e6e519ba


Trivial merge