Merge branch 'tizen_6.0' into tizen 06/262406/1
authorJi-hoon Lee <dalton.lee@samsung.com>
Tue, 10 Aug 2021 05:25:55 +0000 (14:25 +0900)
committerJi-hoon Lee <dalton.lee@samsung.com>
Tue, 10 Aug 2021 05:25:55 +0000 (14:25 +0900)
commit4a4caa05b755982fd2fcba785730300a8132c7b9
tree3fda8ce9c69f3b5289f60a364bed56bfdce97a52
parentfe6aa892f55d6f53d7c4c5e7e2f86fd7d36dc01e
parent15f3af71f9cfa786bfb51273aaaf1714bdb95f6a
Merge branch 'tizen_6.0' into tizen

Change-Id: I51d38a7e2b5dd59d359cb7fd1dc99fbbc6d5aa0d
CMakeLists.txt
plugins/wakeup-manager/src/wakeup_engine_manager.cpp
plugins/wakeup-manager/src/wakeup_manager_wrapper.cpp
src/service_ipc_dbus.cpp
src/service_plugin.cpp