Merge branch 'master' into tizen_2.0

Conflicts:
	packaging/org.tizen.message.spec

> Conflicts is fixed.

Change-Id: Ie5900ab13b3ae54b45500df9e193d3251f882afb

diff --git a/viewer/smil-player/src/msg-smil-media-render.c b/viewer/smil-player/src/msg-smil-media-render.c
index 8910913..4b9c6de 100755 (executable)
--- a/viewer/smil-player/src/msg-smil-media-render.c
+++ b/viewer/smil-player/src/msg-smil-media-render.c
@@ -664,7 +664,7 @@ static void __msg_smil_render_interrupted_cb(player_interrupted_code_e code, voi
        MSG_UI_DEBUG(MSG_UI_LEVEL_DEBUG, "receive MM_MESSAGE_STATE_INTERRUPTED");
 
        switch (code) {
-               case PLAYER_INTERRUPTED_BY_OTHER_APP:
+               case PLAYER_INTERRUPTED_BY_MEDIA:
                        MSG_UI_DEBUG(MSG_UI_LEVEL_DEBUG, "MM_ERROR_PLAYER_BT_CONNECTION");
                        break;