From: Gilbok Lee <gilbok.lee@samsung.com>
Date: Mon, 5 Dec 2016 06:21:56 +0000 (+0900)
Subject: Merge branch 'tizen_3.0' into tizen
X-Git-Tag: accepted/tizen/common/20161207.184515~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F64%2F102164%2F1;p=platform%2Fcore%2Fapi%2Fmediademuxer.git

Merge branch 'tizen_3.0' into tizen

Change-Id: I2c4f742594fdc32723b8385de47a6b058d81ac52
---

729c9ca053b27cda7c73709a1644fdb14578451a