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


Trivial merge