kill tcpdump
Merge branch 'master' of https://github.com/zhx00100/tcpdump.git

Conflicts:
	src/com/baidu/tcpdump/MainActivity.java