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

* commit '1b8fe1f99900105f97dca9d1534d96214bde57a8':
  Remove GLES2-texture.wrap tests from mustpass

Change-Id: Iada16e2bc7b70824153e140db7e8b607b552ad4c


Trivial merge
Domain: Graphics System / GL;