yuri0827
Merge branch 'master' of https://github.com/liangxiaofei1100/AndroidCommunication
modfiy for 0829
fix conflict
0902