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


Trivial merge