[dali_2.0.12] Merge branch 'devel/master' 10/253210/1
authorRichard Huang <r.huang@samsung.com>
Fri, 5 Feb 2021 11:59:11 +0000 (11:59 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 5 Feb 2021 11:59:11 +0000 (11:59 +0000)
Change-Id: Idfa6fcb1916e3aba6e6afee7463a0b391571b03c


Trivial merge