merge

Author: sunshinehu

Diff for: .gitignore

@@ -1,13 +1,22 @@
+<<<<<<< HEAD
 # built application files
 *.apk
 *.ap_
 
 # files for the dex VM
+=======
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+>>>>>>> e852688848f5c7292595745c7008613383c00072
 *.dex
 
 # Java class files
 *.class
 
+<<<<<<< HEAD
 # generated files
 bin/
 gen/
@@ -28,3 +37,21 @@ proguard/
 *.iws
 .idea/
 
+=======
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+>>>>>>> e852688848f5c7292595745c7008613383c00072

Diff for: README.md

@@ -0,0 +1,4 @@
+Websocket-Support-For-Android-
+==============================
+
+Websocket Support For Android Webview and Tomcat server