am 13034e14: DO NOT MERGE: Port GLES2 and 3 binding query tests to use gls state...
authorJarkko Pöyry <jpoyry@google.com>
Mon, 11 Jan 2016 19:38:47 +0000 (19:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:38:47 +0000 (19:38 +0000)
am: da60ab2700  -s ours

* commit 'da60ab270010e98c469a878e4012727cc0aa2937':


Trivial merge