[dali_1.4.52] Merge branch 'devel/master' 42/221542/1
authorRichard Huang <r.huang@samsung.com>
Fri, 3 Jan 2020 11:07:13 +0000 (11:07 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 3 Jan 2020 11:07:13 +0000 (11:07 +0000)
Change-Id: Ie033abebb4626c0a95570de5a920b3796c766e62


Trivial merge