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


Trivial merge