projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6fd942 518f489)
resolve merge conflicts of cfeb3c0 to nyc-dev
authorDaniel Xie <dxie@google.com>
Fri, 6 May 2016 19:12:59 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 May 2016 19:12:59 +0000 (19:12 +0000)
am: 518f489214

* commit '518f4892140466feacb6c7c772357c76a86c3a27':
  Remove GLES2-texture.wrap tests from mustpass

Change-Id: Ie2f928384f03ae0354405124263ce4e8e819f0db


Trivial merge
Domain: Graphics System / GL;