resolve merge conflicts of 9b726ab8 to master

[platform/upstream/VK-GL-CTS.git] / android / .gitignore

diff --git a/android/.gitignore b/android/.gitignore
index 2cdeba2..c26052a 100644 (file)
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -9,3 +9,4 @@ proguard.cfg
 project.properties
 proguard-project.txt
 debug
+native