Merge "Fix read_pixels tests."
authorJarkko Pöyry <jpoyry@google.com>
Fri, 3 Apr 2015 19:41:32 +0000 (19:41 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 3 Apr 2015 19:41:32 +0000 (19:41 +0000)

Trivial merge