Subject : platform/core/multimedia/media-source

[scm/meta/git.git] / git-trees

diff --git a/git-trees b/git-trees
index bc645a7..d3e812e 100755 (executable)
--- a/git-trees
+++ b/git-trees
@@ -11746,6 +11746,17 @@ T: DEV
 O: Jiyong Min <jiyong.min@samsung.com>
 L: 
 
+G: platform/core/multimedia/media-source
+D: Multimedia / Media Vision
+S: MERGE_IF_NECESSARY
+T: DEV
+O: Hyunsoo Park <hance.park@samsung.com>
+O: Inki Dae <inki.dae@samsung.com>
+O: kwang son <k.son@samsung.com>
+O: sangho park <sangho.g.park@samsung.com>
+O: Tae-Young Chung <ty83.chung@samsung.com>
+L: Apache-2.0
+
 G: platform/core/multimedia/mm-hal-interface
 D: Multimedia / Media Common
 S: MERGE_IF_NECESSARY
@@ -17941,10 +17952,9 @@ L:
 
 G: platform/upstream/libtuv
 D: Web Framework / Lightweight Web
-S: REBASE_IF_NECESSARY
+S: MERGE_IF_NECESSARY
 T: OPENM
 O: Haesik Jun <haesik.jun@samsung.com>
-O: Youngil choi <duddlf.choi@samsung.com>
 L: Apache-2.0
 
 G: platform/upstream/libunistring
@@ -27699,21 +27709,21 @@ G: profile/wearable/platform/framework/web/web-widget-engine
 D: Web Framework / Lightweight Web
 S: MERGE_IF_NECESSARY
 T: DEV
-O: Youngil choi <duddlf.choi@samsung.com>
+O: Haesik Jun <haesik.jun@samsung.com>
 L: Apache-2.0
 
 G: profile/wearable/platform/framework/web/web-widget-js
 D: Web Framework / Lightweight Web
 S: MERGE_IF_NECESSARY
 T: DEV
-O: Youngil choi <duddlf.choi@samsung.com>
+O: Haesik Jun <haesik.jun@samsung.com>
 L: Apache-2.0
 
 G: profile/wearable/platform/framework/web/web-widget-runtime
 D: Web Framework / Lightweight Web
 S: MERGE_IF_NECESSARY
 T: DEV
-O: Youngil choi <duddlf.choi@samsung.com>
+O: Haesik Jun <haesik.jun@samsung.com>
 L: Apache-2.0
 
 G: profile/wearable/platform/kernel/linux-3.18-exynos7270