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


Trivial merge