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

* commit '0b55e35def4e0be226b7825ce73d9d2833cadb05':


Trivial merge