projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6b2df7 037808f)
resolve merge conflicts of 037808f59 to oc-mr1-dev
authorMika Isojärvi <misojarvi@google.com>
Fri, 22 Sep 2017 18:44:23 +0000 (11:44 -0700)
committerMika Isojärvi <misojarvi@google.com>
Fri, 22 Sep 2017 20:55:14 +0000 (13:55 -0700)
Bug: 65677277
Test: Ran scripts/check_build_sanity.py build Android CTS.
Change-Id: I0befb24161cddbe1d94ec60ce5a0438907986f31

1  2 
Android.mk patch | diff1 | diff2 | blob | history

diff --cc Android.mk
Simple merge
Domain: Graphics System / GL;