am c65c11dd: Merge "Fix expected results in implicit conversion tests" into mnc-dev...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:40:33 +0000 (19:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:40:33 +0000 (19:40 +0000)
am: 3c7e1cf0ca

* commit '3c7e1cf0ca633839eb98376faa775aeb13b30b27':


Trivial merge