From: Wonnam Jang <wn.jang@samsung.com>
Date: Wed, 8 Mar 2017 04:33:19 +0000 (+0900)
Subject: Merge remote-tracking branch 'origin/tizen_3.0' into tizen
X-Git-Tag: accepted/tizen/unified/20170406.054241~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Ftts.git;a=commitdiff_plain;h=432754c9bf1125a516486885feea2e4204746bd5

Merge remote-tracking branch 'origin/tizen_3.0' into tizen

Conflicts:
	client/tts_dbus.c
	common/tts_config_mgr.c
	common/tts_config_parser.c
	engine-parser/src/tts-engine-parser.c
	server/ttsd_data.cpp
	server/ttsd_dbus.c

Change-Id: I3c402f69af42e38cd6c7810ab3f8792a501d39bb
---

432754c9bf1125a516486885feea2e4204746bd5
diff --cc common/tts_config_mgr.c
index 4b67834,e05446d..717ff9a
mode 100755,100644..100644
--- a/common/tts_config_mgr.c
+++ b/common/tts_config_mgr.c
diff --cc server/ttsd_dbus.c
index 5342bd3,4b2ab38..4b2ab38
mode 100644,100755..100644
--- a/server/ttsd_dbus.c
+++ b/server/ttsd_dbus.c
diff --cc server/ttsd_server.c
index d87437f,1e016e5..8820904
mode 100755,100644..100644
--- a/server/ttsd_server.c
+++ b/server/ttsd_server.c