linphone-android/src
Simon Morlat e8edaa99d6 Merge remote-tracking branch 'public/master' into bellesip
Conflicts:
	jni/Android.mk
	submodules/linphone
2013-06-25 23:42:36 +02:00
..
org/linphone Merge remote-tracking branch 'public/master' into bellesip 2013-06-25 23:42:36 +02:00