Merge pull request #4 from samtstern/master

2016 Import
google · Feb 28, 2017 · e261db2 · e261db2
2 parents d67399f + 6e1fa2f
commit e261db2
Show file tree

Hide file tree

Showing 6,536 changed files with 78,492 additions and 31,325 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,10 @@
+.gradle
+local.properties
+.idea
+build/
 .DS_Store
+*.iml
+*.apk
+*.aar
+*.zip
+google-services.json
diff --git a/CCL/build.gradle b/CCL/build.gradle
diff --git a/CCL/src/main/AndroidManifest.xml b/CCL/src/main/AndroidManifest.xml