From: Gilbok Lee <gilbok.lee@samsung.com>
Date: Tue, 7 Mar 2017 06:24:45 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: submit/tizen/20170403.050513~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=83c5e245094bf50dfdc1970e1bf9b4605df4b47f;p=platform%2Fcore%2Fapi%2Fmediademuxer.git

Merge branch 'tizen_3.0' into tizen

Change-Id: I098325efa8df031c5e54fbdb0b7ea574bc29d931
---

83c5e245094bf50dfdc1970e1bf9b4605df4b47f