Merge "Fix some dEQP GLES2 issues." into lmp-mr1-dev
authorJarkko Pöyry <jpoyry@google.com>
Tue, 11 Nov 2014 18:19:30 +0000 (18:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Nov 2014 18:19:30 +0000 (18:19 +0000)
automerge: a0d087b

* commit 'a0d087b7e2c06cbd2c038e4847dd64961416eb3b':
  Fix some dEQP GLES2 issues.


Trivial merge