Merge "Match columns of bookmark with filter keyword" into tizen

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

Wed, 3 Apr 2019 05:17:37 +0000 (05:17 +0000)

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

Wed, 3 Apr 2019 05:17:37 +0000 (05:17 +0000)
author hj kim <backto.kim@samsung.com>
Wed, 3 Apr 2019 05:17:37 +0000 (05:17 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 3 Apr 2019 05:17:37 +0000 (05:17 +0000)
diff --cc include/media_info_private.h
Simple merge
diff --cc include_product/media_info_private.h
Simple merge
author	hj kim <backto.kim@samsung.com>
	Wed, 3 Apr 2019 05:17:37 +0000 (05:17 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Wed, 3 Apr 2019 05:17:37 +0000 (05:17 +0000)
		1	2
include/media_info_private.h	patch \|	diff1 \|	diff2 \|	blob \| history
include_product/media_info_private.h	patch \|	diff1 \|	diff2 \|	blob \| history