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


Trivial merge