Merge remote-tracking branch 'newui/newUI' into newUI

Conflicts:
	AndroidManifest.xml
	build.xml
	src/org/linphone/DialerActivity.java
	src/org/linphone/IncallActivity.java
	src/org/linphone/LinphoneManager.java
	src/org/linphone/LinphoneService.java
	src/org/linphone/LinphoneSimpleListener.java
	src/org/linphone/LinphoneUtils.java
	src/org/linphone/VideoCallActivity.java
	src/org/linphone/core/LinphoneCallImpl.java
	src/org/linphone/core/LinphoneCoreImpl.java

diff --git a/LinphoneCallLogImpl.java b/LinphoneCallLogImpl.java
index 996b51c10b9921510be77d0db4ac37db98d58672..8972f0a76a343474cf6dd4dbc39ac5f86bea9165 100644 (file)
--- a/LinphoneCallLogImpl.java
+++ b/LinphoneCallLogImpl.java
@@ -52,7 +52,7 @@ class LinphoneCallLogImpl implements LinphoneCallLog {
        public long getNativePtr() {
                return nativePtr;
        }
-
+       
        public String getStartDate() {
                return getStartDate(nativePtr);
        }