Merge branch 'upstream' into tizen
authorANZ1217 <chihun.jeong@samsung.com>
Tue, 16 Jan 2024 08:53:14 +0000 (17:53 +0900)
committerANZ1217 <chihun.jeong@samsung.com>
Tue, 16 Jan 2024 08:53:14 +0000 (17:53 +0900)
commit402f21954eac06711d836be3c2fe54ad35b3aa73
tree592027ce476e3a4af66a63a2dfa5047bbe06dd28
parent4fd2b427dcafe6429328424b240f1ad15d1f0add
parent7aa11e43ef72a5b04665c1efb407cfccc188af27
Merge branch 'upstream' into tizen

Change-Id: I42d85a08a6a8438cbdaae0be87bef1aa957b6ed2
fonts.conf.in