0924 autorename
Merge branch 'master' of github.com:liangxiaofei1100/AndroidCommunication
0924 fix conflict