Merge remote-tracking branch 'github/master' into dicej

Conflicts:
	makefile
This commit is contained in:
Joel Dice 2013-02-27 10:09:38 -07:00
commit 3eda6ab0a2
2 changed files with 2 additions and 1 deletions

View File

@ -136,6 +136,7 @@
public InetSocketAddress(java.net.InetAddress, int);
}
-keep class java.net.ServerSocket
-keep class java.net.SocketTimeoutException
-keepclassmembers class java.net.PlainSocketImpl {
<fields>;