am 214b48de: Merge "Fix deutil and decpp -Wconversion warnings."
authorJarkko Pöyry <jpoyry@google.com>
Thu, 28 May 2015 21:59:40 +0000 (21:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 28 May 2015 21:59:40 +0000 (21:59 +0000)
* commit '214b48debf8a6589fe82ffefcccf537846dfaade':
  Fix deutil and decpp -Wconversion warnings.


Trivial merge