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

This commit is contained in:
Guillaume Beraudo 2011-04-19 14:13:12 +02:00
commit 656d0d720a

@ -1 +1 @@
Subproject commit 0601440e03eae29ddc3f44ce079536f8156c48f4
Subproject commit ed8a2f44d51c9a2c10fe0f531b4f7a2640aaa68c