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)
* commit 'dac80f5b0dbf840e15d6d2eb8eed2e7ee7113b66':
  Fix -Wconversion warnings in framework/common.


Trivial merge