projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3669b3b
a6eacd8
)
resolve merge conflicts of cfeb3c0 to nyc-dev am: 518f489214
author
Mika Isojärvi
<misojarvi@google.com>
Fri, 6 May 2016 19:17:38 +0000
(19:17 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 6 May 2016 19:17:38 +0000
(19:17 +0000)
am:
a6eacd8101
* commit '
a6eacd810172a6b01938470ba105121ca742761b
':
Remove GLES2-texture.wrap tests from mustpass
Change-Id: I1622b91e38e1f480ee298385d2a187cff8a8e96a
Trivial merge