linphone-android/jni
Simon Morlat bb2714a303 Merge remote-tracking branch 'origin/bctoolbox'
Conflicts:
	submodules/belle-sip
	submodules/linphone
2016-02-17 11:54:04 +01:00
..
Android.mk Merge remote-tracking branch 'origin/bctoolbox' 2016-02-17 11:54:04 +01:00
Application.mk Merge remote-tracking branch 'origin/bctoolbox' 2016-02-17 11:54:04 +01:00