projects / platform / upstream / VK-GL-CTS.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: af7a952 9b726ab)
resolve merge conflicts of 9b726ab8 to master
authorMika Isojärvi <misojarvi@google.com>
Fri, 22 Sep 2017 17:39:21 +0000 (10:39 -0700)
committerMika Isojärvi <misojarvi@google.com>
Fri, 22 Sep 2017 17:39:21 +0000 (10:39 -0700)
commit02473c7876fd828052ec60d7eb4dc94d32eb0723
tree56d58d9a95358823ee5f2e054040e8817ffaa7a0tree | snapshot
parentaf7a952886c322416f52fc552a94fdada80b3503commit | diff
parent9b726ab8010fb967e6d812585649e0127ae0e2e7commit | diff
resolve merge conflicts of 9b726ab8 to master

Test: Ran scripts/check_build_sanity.py build Android CTS.
Change-Id: Ibc797d43c71edee9a82592369f30d6a72bfcde2f
Android.mk diff1 | diff2 | blob | history
Domain: Graphics System / GL;