am 4e51181f: Merge "Fix -Wconversion warnings in buffer test util."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 19:55:54 +0000 (19:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 19:55:54 +0000 (19:55 +0000)
* commit '4e51181fd35edfd37919fca6044639ab4fac4408':
  Fix -Wconversion warnings in buffer test util.


Trivial merge