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


Trivial merge