Merge "Fix some dEQP GLES2 issues." into lmp-mr1-dev
authorJarkko Pöyry <jpoyry@google.com>
Tue, 11 Nov 2014 17:51:09 +0000 (17:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 11 Nov 2014 17:51:09 +0000 (17:51 +0000)

Trivial merge