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)
commit11ba11b02440ad21d916bfca0a3f135b5791b27e
treeba40b51b5f494cd6e5ae3996374732147b727f23
parent7c5ca458333348f5732bbec946d6edd9393824d0
parentab888c4e417a91032a3a6a5453aa5c099fd67372
am ab888c4e: am c65c11dd: Merge "Fix expected results in implicit conversion tests" into mnc-dev

* commit 'ab888c4e417a91032a3a6a5453aa5c099fd67372':
  Fix expected results in implicit conversion tests