am 64f1a067: Merge "Check OES_texture_npot in ES2 texture completeness tests." into...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:32:24 +0000 (19:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:32:24 +0000 (19:32 +0000)
am: eac4a981b6

* commit 'eac4a981b6be14683cca49ec117f011c11e43b36':


Trivial merge