Merge "Fix -Wconversion warnings in qphelper."
authorJarkko Pöyry <jpoyry@google.com>
Thu, 21 May 2015 19:35:32 +0000 (19:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 May 2015 19:35:32 +0000 (19:35 +0000)

Trivial merge