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


Trivial merge