am 84dc52eb: Merge "Fix some -Wconversion warnings."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 5 Jun 2015 01:53:37 +0000 (01:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 5 Jun 2015 01:53:37 +0000 (01:53 +0000)
commit38a0ae9079537d106f2057be9eb216aeb4cceb18
tree0feb0182c988df2090dac0b0859ec072bc229938
parentd9f904dc11bd437c8d61091ae4958bb5b58d1f2c
parent84dc52ebc4748220d26bb63d884a5ab37e1204cf
am 84dc52eb: Merge "Fix some -Wconversion warnings."

* commit '84dc52ebc4748220d26bb63d884a5ab37e1204cf':
  Fix some -Wconversion warnings.