projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 41cd9b0 4661d31)
DO NOT MERGE: Restore accidentally reverted mustpass .txt changes am: 6b37e7d055...
authorPyry Haulos <phaulos@google.com>
Mon, 11 Jan 2016 19:52:31 +0000 (19:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:52:31 +0000 (19:52 +0000)
am: 4661d31646  -s ours

* commit '4661d3164650bd8e510903f0633e17244abadc76':
  DO NOT MERGE: Restore accidentally reverted mustpass .txt changes


Trivial merge
Domain: Graphics System / GL;