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)
Change-Id: I51d38a7e2b5dd59d359cb7fd1dc99fbbc6d5aa0d

1  2 
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

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge