am 830c3ac0: Merge "Fix -Wconversion warnings in readpixels tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 19:55:51 +0000 (19:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 19:55:51 +0000 (19:55 +0000)
* commit '830c3ac0e4b1b4ae8ebd10369dbb16b6057eb2eb':
  Fix -Wconversion warnings in readpixels tests.


Trivial merge