Merge "add service_profile field for pvr table" into tizen

author hj kim <backto.kim@samsung.com>

Tue, 4 Dec 2018 01:51:29 +0000 (01:51 +0000)

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

Tue, 4 Dec 2018 01:51:29 +0000 (01:51 +0000)
author hj kim <backto.kim@samsung.com>
Tue, 4 Dec 2018 01:51:29 +0000 (01:51 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 4 Dec 2018 01:51:29 +0000 (01:51 +0000)
diff --cc include_product/media_info_private.h
Simple merge
diff --cc src/media_db.c
Simple merge
diff --cc test/media-content_test.c
Simple merge
author	hj kim <backto.kim@samsung.com>
	Tue, 4 Dec 2018 01:51:29 +0000 (01:51 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Tue, 4 Dec 2018 01:51:29 +0000 (01:51 +0000)
		1	2
include_product/media_info_private.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/media_db.c	patch \|	diff1 \|	diff2 \|	blob \| history
test/media-content_test.c	patch \|	diff1 \|	diff2 \|	blob \| history