am 999a3a5d: Merge "Enable -Wconversion."
authorJarkko Pöyry <jpoyry@google.com>
Tue, 30 Jun 2015 17:22:56 +0000 (17:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Jun 2015 17:22:56 +0000 (17:22 +0000)
commite9926b07b8f87c15df2c57fbe390640cbc922c1d
treefa1e58ecf31051aa1c3a164ab289c00764e761ac
parent614e301d9918abdaef4b5fc0c5e15d13017481da
parent999a3a5d7dfaf7790797f3a6227f33a15b3454e4
am 999a3a5d: Merge "Enable -Wconversion."

* commit '999a3a5d7dfaf7790797f3a6227f33a15b3454e4':
  Enable -Wconversion.