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


Trivial merge