Simon Morlat c7772f1682 Merge branch 'master' into dev_phonenumber ... Conflicts: res/layout/assistant_codec_downloader.xml		2016-09-23 13:03:04 +02:00
..
org/linphone/test	Merge branch 'master' into dev_phonenumber	2016-09-23 13:03:04 +02:00