From: Jeongmo Yang <jm80.yang@samsung.com>
Date: Tue, 15 Nov 2016 05:17:42 +0000 (+0900)
Subject: Merge branch 'tizen' into tizen_3.0
X-Git-Tag: submit/tizen_3.0/20161115.060306^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1ed02daf8aae544c0c7432ae376e21dc24d35ec0;p=platform%2Fcore%2Fmultimedia%2Fmmfw-sysconf.git

Merge branch 'tizen' into tizen_3.0

Conflicts:
	packaging/mmfw-sysconf.spec

Change-Id: Ie71759b283cc815dc8f7068310192e9887601d20
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
---

1ed02daf8aae544c0c7432ae376e21dc24d35ec0