Merge branch 'tizen_5.5' into tizen 63/229563/1
authorJi-hoon Lee <dalton.lee@samsung.com>
Thu, 2 Apr 2020 03:21:14 +0000 (12:21 +0900)
committerJi-hoon Lee <dalton.lee@samsung.com>
Thu, 2 Apr 2020 03:21:14 +0000 (12:21 +0900)
commitee9ef3f1886d404a1161134900fa6ecddbfb38b4
tree5622c454c31d28d56bd37d0564c0b1e2447e35d6
parent8859fc4df46b066e807970fed7961477770f221d
parentb4e7daa6b352f6b957dfbf3e522a454fc16c163d
Merge branch 'tizen_5.5' into tizen

Change-Id: I784fa584dddbcaf536edc9f9656a78f66cd99412
inc/multi_assistant_service_client.h
inc/multi_assistant_service_plugin.h
packaging/org.tizen.multi-assistant-service.spec
plugins/wakeup-manager/src/wakeup_manager_wrapper.cpp
src/multi_assistant_service.c
src/multi_assistant_service_plugin.c