From: SeokHoon Lee <andy.shlee@samsung.com>
Date: Mon, 5 Dec 2016 02:01:37 +0000 (+0900)
Subject: Merge branch 'tizen' into tizen_3.0
X-Git-Tag: submit/tizen_3.0/20161206.052949~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0cb4030bcd863380329522b54d7a190b07d392f6;p=platform%2Fcore%2Fmultimedia%2Fmmfw-sysconf.git

Merge branch 'tizen' into tizen_3.0

Conflicts:
	packaging/mmfw-sysconf.spec

Change-Id: I33fb03c599912f9dd962d6e8c1a6f35e63679401
---

0cb4030bcd863380329522b54d7a190b07d392f6