linphone-android/jni
Yann Diorcet 228ad26554 Merge branch 'master' into bellesip
Conflicts:
	submodules/linphone
2013-04-05 12:51:24 +02:00
..
Android.mk Merge branch 'master' into bellesip 2013-04-05 12:51:24 +02:00
Application.mk add build option to disable polarssl 2013-04-02 09:18:25 +02:00