projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f53477 b57a8fe)
Merge remote-tracking branch 'aosp/master' into deqp-dev
authorChris Forbes <chrisforbes@google.com>
Wed, 3 Oct 2018 00:37:50 +0000 (17:37 -0700)
committerChris Forbes <chrisforbes@google.com>
Wed, 3 Oct 2018 01:12:19 +0000 (18:12 -0700)
Merge with -s ours; only change on aosp/master was for P mustpass
adjustment, which we don't want to propagate any further.

Change-Id: Ie16be989540969d0ac2b4423a290d1d01f17f376


Trivial merge
Domain: Graphics System / GL;