From: Gilbok Lee <gilbok.lee@samsung.com>
Date: Thu, 16 Feb 2017 10:48:46 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: accepted/tizen/common/20170404.142320~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75dd875b28ee992af5e0dc929995e6a52e07fb60;p=platform%2Fcore%2Fapi%2Fmediamuxer.git

Merge branch 'tizen_3.0' into tizen

Change-Id: I90ee06f34434297680c6ba4409162ab732c211b7
---

75dd875b28ee992af5e0dc929995e6a52e07fb60