Merge "Change trace labels" into honeycomb-mr1
diff --git a/libvideoeditor/osal/src/M4PSW_Trace.c b/libvideoeditor/osal/src/M4PSW_Trace.c
index ef39d82..17b0af6 100755
--- a/libvideoeditor/osal/src/M4PSW_Trace.c
+++ b/libvideoeditor/osal/src/M4PSW_Trace.c
@@ -64,9 +64,9 @@
 
     /* do the actual print */
 #ifdef NO_FILE
-    __android_log_print(ANDROID_LOG_INFO, "LifeVibesTrace", "%s", (char*)message);
+    __android_log_print(ANDROID_LOG_INFO, "M4OSA_Trace", "%s", (char*)message);
 #else /* NO_FILE     */
-    __android_log_print(ANDROID_LOG_INFO, "LifeVibesTrace", "%s", "%s at %lu in %s",
+    __android_log_print(ANDROID_LOG_INFO, "M4OSA_Trace", "%s", "%s at %lu in %s",
                                                    (char *)message, line, file);
 #endif /* NO_FILE     */
 
@@ -89,9 +89,9 @@
 
     /* do the actual print */
 #ifdef NO_FILE
-    __android_log_print(ANDROID_LOG_INFO, "LifeVibesTrace", "%s", (char*)message);
+    __android_log_print(ANDROID_LOG_INFO, "M4OSA_TRACE_traceFunction", "%s", (char*)message);
 #else /* NO_FILE     */
-    __android_log_print(ANDROID_LOG_INFO, "LifeVibesTrace", "%s", "%s at %lu in %s",
+    __android_log_print(ANDROID_LOG_INFO, "M4OSA_TRACE_traceFunction", "%s", "%s at %lu in %s",
                                             (char *)message, line, (char*)file);
 #endif /* NO_FILE     */