am f864391c: Merge "Fix -Wconversion warnings in readpixels tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 22 May 2015 20:45:28 +0000 (20:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 May 2015 20:45:28 +0000 (20:45 +0000)
* commit 'f864391c7f0671b5046f3adee09366e92b8a002a':
  Fix -Wconversion warnings in readpixels tests.


Trivial merge