projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3669b3b 5e80b7e)
resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214
authorMika Isojärvi <misojarvi@google.com>
Fri, 6 May 2016 19:17:37 +0000 (19:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 6 May 2016 19:17:37 +0000 (19:17 +0000)
am: 5e80b7e463

* commit '5e80b7e46307c206f4df887202119da61c096ecd':
  Remove GLES2-texture.wrap tests from mustpass

Change-Id: I900430dad177b690ea13d018467126c396de41e0


Trivial merge
Domain: Graphics System / GL;