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)
commit40648c588f77073e3898d132e061b184b3059d94
treef5485a2293b54c70962845b93b2605bac9f94499
parentf48b072b05a0bdd55884fe0c51ccd0903b0b23bd
parent2b2cf9bba4c8128ba7eb034c726d47da97cab55a
am 2b2cf9bb: Merge "Fix -Wconversion warnings in qphelper."

* commit '2b2cf9bba4c8128ba7eb034c726d47da97cab55a':
  Fix -Wconversion warnings in qphelper.