[dali_1.4.12] Merge branch 'devel/master' 84/202084/1
authorRichard Huang <r.huang@samsung.com>
Fri, 22 Mar 2019 10:46:44 +0000 (10:46 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 22 Mar 2019 10:46:44 +0000 (10:46 +0000)
Change-Id: I448f32e352ec2d1219c7f25d8640a4e426a2fbeb


Trivial merge