Merge branch 'tizen_5.5' into tizen 90/234490/1 accepted/tizen/unified/20200528.132846 submit/tizen/20200527.013750
authorInHong Han <inhong1.han@samsung.com>
Wed, 27 May 2020 01:21:42 +0000 (10:21 +0900)
committerInHong Han <inhong1.han@samsung.com>
Wed, 27 May 2020 01:21:42 +0000 (10:21 +0900)
Change-Id: Id3b93533683168a773482c2c8110d1a770bb44db

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

Simple merge
Simple merge