roger-1
Merge branch 'master' of https://github.com/rogerhzh/linphone_XIA
Merge branch 'master' of https://github.com/rogerhzh/linphone_XIA