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


Trivial merge