[dali_1.4.2] Merge branch 'devel/master' 01/197501/1
authorRichard Huang <r.huang@samsung.com>
Fri, 11 Jan 2019 12:39:55 +0000 (12:39 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 11 Jan 2019 12:39:55 +0000 (12:39 +0000)
Change-Id: I50b7552a523102c8c0596cb25fb127acdbf3bc4e


Trivial merge