[0.2.68] Merge branch 'tizen_4.0' into 'tizen'

author Eunhae Choi <eunhae1.choi@samsung.com>

Fri, 29 Dec 2017 02:08:18 +0000 (11:08 +0900)

committer Eunhae Choi <eunhae1.choi@samsung.com>

Fri, 29 Dec 2017 02:09:10 +0000 (11:09 +0900)
author Eunhae Choi <eunhae1.choi@samsung.com>
Fri, 29 Dec 2017 02:08:18 +0000 (11:08 +0900)
committer Eunhae Choi <eunhae1.choi@samsung.com>
Fri, 29 Dec 2017 02:09:10 +0000 (11:09 +0900)
diff --cc legacy/src/legacy_player.c
Simple merge
diff --cc muse/api.list
Simple merge
diff --cc muse/src/muse_player.c
Simple merge
author	Eunhae Choi <eunhae1.choi@samsung.com>
	Fri, 29 Dec 2017 02:08:18 +0000 (11:08 +0900)
committer	Eunhae Choi <eunhae1.choi@samsung.com>
	Fri, 29 Dec 2017 02:09:10 +0000 (11:09 +0900)
		1	2
legacy/src/legacy_player.c	patch \|	diff1 \|	diff2 \|	blob \| history
muse/api.list	patch \|	diff1 \|	diff2 \|	blob \| history
muse/src/muse_player.c	patch \|	diff1 \|	diff2 \|	blob \| history