Merge "Remove a few texture tests from ES2 mustpass" into marshmallow-cts-dev am...
authorDaniel Xie <dxie@google.com>
Tue, 23 Feb 2016 23:02:31 +0000 (23:02 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Feb 2016 23:02:31 +0000 (23:02 +0000)
am: 6e415153e0  -s ours

* commit '6e415153e08f2b14e74301e0c1a122b5cec76bd7':
  Remove a few texture tests from ES2 mustpass


Trivial merge