am 34ae17f5: Merge "Fix deInt32.h -Wconversion warnings."
authorJarkko Pöyry <jpoyry@google.com>
Thu, 21 May 2015 19:45:04 +0000 (19:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 May 2015 19:45:04 +0000 (19:45 +0000)
* commit '34ae17f54dc8f8de485dfaa75674a72dc556089f':
  Fix deInt32.h -Wconversion warnings.


Trivial merge