am 64f1a067: Merge "Check OES_texture_npot in ES2 texture completeness tests." into...
authorJarkko Pöyry <jpoyry@google.com>
Tue, 5 May 2015 19:08:04 +0000 (19:08 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 5 May 2015 19:08:04 +0000 (19:08 +0000)
* commit '64f1a0675359d8c3855da2918dc42e0ef3945675':
  Check OES_texture_npot in ES2 texture completeness tests.


Trivial merge