linphone-iphone/build/android
Guillaume Beraudo ecca92fc21 Merge commit 'c519c4a'
Conflicts:
	build/android/Android.mk
2011-03-31 10:58:35 +02:00
..
Android.mk Merge commit 'c519c4a' 2011-03-31 10:58:35 +02:00