Merge branch 'tizen_6.0' into tizen 29/250829/1
authorJi-hoon Lee <dalton.lee@samsung.com>
Tue, 5 Jan 2021 04:42:51 +0000 (13:42 +0900)
committerJi-hoon Lee <dalton.lee@samsung.com>
Tue, 5 Jan 2021 04:42:51 +0000 (13:42 +0900)
Change-Id: I23fd57503e4a442555cc6e674224feb39d77bfdb


Trivial merge