projects
/
platform
/
upstream
/
VK-GL-CTS.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
resolve merge conflicts of 9b726ab8 to master
[platform/upstream/VK-GL-CTS.git]
/
android
/
.gitignore
diff --git
a/android/.gitignore
b/android/.gitignore
index
c8aa7c4
..
c26052a
100644
(file)
--- a/
android/.gitignore
+++ b/
android/.gitignore
@@
-9,4
+9,4
@@
proguard.cfg
project.properties
proguard-project.txt
debug
-build
+native