fix
Merge pull request #1 from cheyiliu/master

update the native socket in android_Ethernet_pluggedin_or_unplugged_even...
fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	SystemConf.markdown
	gnome.txt