Merge "Fix int to bool conversion warning" into nyc-dev
authorPyry Haulos <phaulos@google.com>
Mon, 21 Mar 2016 21:04:25 +0000 (21:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 21 Mar 2016 21:04:26 +0000 (21:04 +0000)

Trivial merge