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


Trivial merge