This is a sample project of Android VoIP.
Transfer files.
Transfer Files
deleted useless button
VoIP working
Merge JavaTcpIPExmaple to master
Merge branch 'AndroidVoIP' into 'master'

Conflicts:
	.classpath
	bin/.gitignore
	bin/Cardboard.apk
	bin/DarronNetServer$ServerSpeaker.class
	bin/DarronNetServer.class
	bin/DarronNetServer1$ServerSpeaker.class
	bin/DarronNetServer1.class
	bin/NetB$ThreadTwo.class
	bin/NetB.class
	bin/NetB1$ThreadTwo.class
	bin/NetB1.class
	bin/classes.dex
	bin/classes/com/IYYX/cardboard/MainActivity.class
	bin/dexedLibs/android-support-v4-4d90d348c6c0155f041f4d7ba59c24a9.jar
	bin/dexedLibs/cardboard-ef97ea6a982ab179b5a2b3c8fded7f74.jar
	bin/dexedLibs/modelloader-81c5526de44a7e30310af8d0af7f5791.jar
	bin/resources.ap_
	gen/com/IYYX/cardboard/R.java
	src/com/IYYX/cardboard/MainActivity.java
Fixed Build Path after merge.