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)
commit0e14640e5a3fe58f244fab2e5c750c1ce2e586fe
treec9dba2ddcbb61360aee96586fea40d75a92d143d
parentfb216e507274b2c34a4dbe180b52c7ec180f993a
parent830c3ac0e4b1b4ae8ebd10369dbb16b6057eb2eb
am 830c3ac0: Merge "Fix -Wconversion warnings in readpixels tests."

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