am 2b2cf9bb: Merge "Fix -Wconversion warnings in qphelper."
authorJarkko Pöyry <jpoyry@google.com>
Thu, 21 May 2015 19:45:06 +0000 (19:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 May 2015 19:45:06 +0000 (19:45 +0000)
* commit '2b2cf9bba4c8128ba7eb034c726d47da97cab55a':
  Fix -Wconversion warnings in qphelper.


Trivial merge