Merge branch 'tizen_5.5' into tizen_6.0 64/247664/1
authorJihoon Kim <jihoon48.kim@samsung.com>
Fri, 13 Nov 2020 07:07:51 +0000 (16:07 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Fri, 13 Nov 2020 07:07:58 +0000 (16:07 +0900)
Change-Id: Id945bae7cbb1ffa82d0ac869a589b887d8da5389

1  2 
packaging/capi-ui-sticker.spec
server/stickerd_data_manager.c

Simple merge
Simple merge