am dac80f5b: Merge "Fix -Wconversion warnings in framework/common."
authorJarkko Pöyry <jpoyry@google.com>
Thu, 21 May 2015 19:45:05 +0000 (19:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 May 2015 19:45:05 +0000 (19:45 +0000)
commitf48b072b05a0bdd55884fe0c51ccd0903b0b23bd
treed5b499f42129d4036ba5a57f8099c5478a85f0a0
parent8214bc6d36a0098312613bdaee18c28325076b34
parentdac80f5b0dbf840e15d6d2eb8eed2e7ee7113b66
am dac80f5b: Merge "Fix -Wconversion warnings in framework/common."

* commit 'dac80f5b0dbf840e15d6d2eb8eed2e7ee7113b66':
  Fix -Wconversion warnings in framework/common.