Merge branch 'tizen' into tizen_4.0 63/156963/1 accepted/tizen/4.0/unified/20171023.120437 submit/tizen_4.0/20171023.025046 tizen_4.0.m2_release
authorhj kim <backto.kim@samsung.com>
Mon, 23 Oct 2017 02:49:35 +0000 (11:49 +0900)
committerhj kim <backto.kim@samsung.com>
Mon, 23 Oct 2017 02:49:59 +0000 (11:49 +0900)
Change-Id: I6a3ee74155869491963f53d7679d88ad18ddc827

1  2 
packaging/media-server.spec

Simple merge