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


Trivial merge