Merge "[Multimedia] Sync with the original project"
authorcoderhyme <jhyo.kim@samsung.com>
Fri, 18 Aug 2017 04:15:19 +0000 (04:15 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 18 Aug 2017 04:15:19 +0000 (04:15 +0000)

Trivial merge