Merge branch 'upstream' into tizen 05/254905/1
authorBartlomiej Grzelewski <b.grzelewski@samsung.com>
Wed, 10 Mar 2021 09:40:10 +0000 (10:40 +0100)
committerBartlomiej Grzelewski <b.grzelewski@samsung.com>
Wed, 10 Mar 2021 09:40:10 +0000 (10:40 +0100)
Change-Id: Ib40eaf242c349def9363df4b2a9a78b9b06fcb95

1  2 
NEWS
atk/atktext.c

diff --cc NEWS
Simple merge
diff --cc atk/atktext.c
Simple merge