am a0e21bdc: Merge "Fix some dEQP GLES2 issues." into lmp-mr1-dev automerge: a0d087b
authorJarkko Pöyry <jpoyry@google.com>
Tue, 11 Nov 2014 18:40:00 +0000 (18:40 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Nov 2014 18:40:00 +0000 (18:40 +0000)
* commit 'a0e21bdc28151ed4656a0f87860781da8bec7eb3':
  Fix some dEQP GLES2 issues.


Trivial merge