Merge branch 'master' of git.linphone.org:linphone-android

This commit is contained in:
Sylvain Berfini 2012-12-21 16:58:34 +01:00
commit f5104636ce

@ -1 +1 @@
Subproject commit ebf0b1897ac114c998a59a3d344417603c25069b Subproject commit 722a616f6adc85885e3ebd4bfb3eb3ec9fb1817b