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)
commit9ba81e6cdbcfad8407a1021f5165d0423d6ddab8
tree99abbdc4ff822250e9fc4b81d4928b4afb1985d5
parent88704275e823b4e3b5198a84d66905e844c509ea
parentf864391c7f0671b5046f3adee09366e92b8a002a
am f864391c: Merge "Fix -Wconversion warnings in readpixels tests."

* commit 'f864391c7f0671b5046f3adee09366e92b8a002a':
  Fix -Wconversion warnings in readpixels tests.