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