am ae54bd83: Merge "Fix various type and sign conversion warnings."
authorJarkko Pöyry <jpoyry@google.com>
Thu, 28 May 2015 21:37:57 +0000 (21:37 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 21:37:57 +0000 (21:37 +0000)
* commit 'ae54bd835e0c8f4c4c348e252f5969b49f35a649':
  Fix various type and sign conversion warnings.


Trivial merge