Merge "Try to prepare when dbus call is requested earlier while a tts engine is reset...

author Sooyeon Kim <sooyeon.kim@samsung.com>

Tue, 23 Jan 2018 05:33:32 +0000 (05:33 +0000)

committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>

Tue, 23 Jan 2018 05:33:33 +0000 (05:33 +0000)
author Sooyeon Kim <sooyeon.kim@samsung.com>
Tue, 23 Jan 2018 05:33:32 +0000 (05:33 +0000)
committer Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 23 Jan 2018 05:33:33 +0000 (05:33 +0000)
diff --cc client/tts.c
Simple merge
diff --cc common/tts_defs.h
Simple merge
diff --cc include/tts_internal.h
Simple merge
author	Sooyeon Kim <sooyeon.kim@samsung.com>
	Tue, 23 Jan 2018 05:33:32 +0000 (05:33 +0000)
committer	Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
	Tue, 23 Jan 2018 05:33:33 +0000 (05:33 +0000)
		1	2
client/tts.c	patch \|	diff1 \|	diff2 \|	blob \| history
common/tts_defs.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/tts_internal.h	patch \|	diff1 \|	diff2 \|	blob \| history