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


Trivial merge