Merge "Fix expected results in implicit conversion tests" into mnc-dev
authorJarkko Pöyry <jpoyry@google.com>
Thu, 18 Jun 2015 19:16:11 +0000 (19:16 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 18 Jun 2015 19:16:12 +0000 (19:16 +0000)

Trivial merge