Merge branch 'tizen_5.5' into tizen 69/230669/1 accepted/tizen/unified/20200417.152752 submit/tizen/20200413.091541 submit/tizen/20200416.003654
authorJihoon Kim <jihoon48.kim@samsung.com>
Mon, 13 Apr 2020 09:14:14 +0000 (18:14 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Mon, 13 Apr 2020 09:14:20 +0000 (18:14 +0900)
Change-Id: I12dd6fe794d5c2fffa28ef77f5b2de0295f4957f

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

Simple merge
Simple merge