Merge "Fix error getting conflict status" into tizen
authorKwangyoun Kim <ky85.kim@samsung.com>
Fri, 19 May 2017 05:09:28 +0000 (05:09 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 19 May 2017 05:09:28 +0000 (05:09 +0000)
1  2 
src/voice_control_webview.cpp

Simple merge