projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32337c2 5b25713)
resolve merge conflicts of 5b2571349 to oc-mr1-dev-plus-aosp
authorMika Isojärvi <misojarvi@google.com>
Tue, 5 Sep 2017 18:15:08 +0000 (11:15 -0700)
committerMika Isojärvi <misojarvi@google.com>
Tue, 5 Sep 2017 18:15:08 +0000 (11:15 -0700)
Test: Ran check_build_sanity.py.
Change-Id: I57546248a0851acf9bfdae0ce560e4a2006f2141


Trivial merge
Domain: Graphics System / GL;