am ab888c4e: am c65c11dd: Merge "Fix expected results in implicit conversion tests...
authorJarkko Pöyry <jpoyry@google.com>
Thu, 18 Jun 2015 20:10:37 +0000 (20:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 18 Jun 2015 20:10:37 +0000 (20:10 +0000)
* commit 'ab888c4e417a91032a3a6a5453aa5c099fd67372':
  Fix expected results in implicit conversion tests


Trivial merge