Merge branch 'tizen_5.5' into tizen 37/234737/1 accepted/tizen/unified/20200528.132813 submit/tizen/20200528.081843
authorJi-hoon Lee <dalton.lee@samsung.com>
Thu, 28 May 2020 07:56:17 +0000 (16:56 +0900)
committerJi-hoon Lee <dalton.lee@samsung.com>
Thu, 28 May 2020 07:56:17 +0000 (16:56 +0900)
commite366ad5f9f02894008b41bfbda8392281a37066d
tree19ee0236ddac7cc72f2a0ee62ad77db58bcc7754
parent63c1b48f41d2db9606e5a5c1d7e72c73156ef2db
parent8a540b3b1022845c79abc1dd336e24fece7f22e0
Merge branch 'tizen_5.5' into tizen

Change-Id: I9c39998a178d14cdcbfefe6e0cea0a811c0f5427
org.tizen.multi-assistant-service.xml
packaging/org.tizen.multi-assistant-service.spec
plugins/wakeup-manager/inc/wakeup_engine_manager.h
plugins/wakeup-manager/src/wakeup_engine_manager.cpp
plugins/wakeup-manager/src/wakeup_manager_wrapper.cpp
src/service_main.cpp