Merge "[fix][mediacontroller] fix error with new metadata features" into tizen

author Piotr Kosko <p.kosko@samsung.com>

Mon, 30 Sep 2019 14:03:03 +0000 (14:03 +0000)

committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>

Mon, 30 Sep 2019 14:03:03 +0000 (14:03 +0000)
author Piotr Kosko <p.kosko@samsung.com>
Mon, 30 Sep 2019 14:03:03 +0000 (14:03 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 30 Sep 2019 14:03:03 +0000 (14:03 +0000)
diff --cc src/mediacontroller/mediacontroller_utils.cc
Simple merge
diff --cc src/mediacontroller/mediacontroller_utils.h
Simple merge
author	Piotr Kosko <p.kosko@samsung.com>
	Mon, 30 Sep 2019 14:03:03 +0000 (14:03 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Mon, 30 Sep 2019 14:03:03 +0000 (14:03 +0000)
		1	2
src/mediacontroller/mediacontroller_utils.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mediacontroller/mediacontroller_utils.h	patch \|	diff1 \|	diff2 \|	blob \| history