[dali_1.3.48] Merge branch 'devel/master' 58/192358/1
authorRichard Huang <r.huang@samsung.com>
Fri, 2 Nov 2018 11:42:44 +0000 (11:42 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 2 Nov 2018 11:42:44 +0000 (11:42 +0000)
Change-Id: I102091082826b9264e469562ac74541ff2ac4f33


Trivial merge