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


Trivial merge