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

* commit 'ab888c4e417a91032a3a6a5453aa5c099fd67372':


Trivial merge