[dali_1.3.49] Merge branch 'devel/master' 85/192785/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 9 Nov 2018 09:37:04 +0000 (09:37 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 9 Nov 2018 09:37:04 +0000 (09:37 +0000)
Change-Id: I2154787a8189ca43bdf167834d17d457a0889711


Trivial merge