[dali_1.3.49] Merge branch 'devel/master' 84/192784/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 9 Nov 2018 09:36:58 +0000 (09:36 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 9 Nov 2018 09:36:58 +0000 (09:36 +0000)
Change-Id: I6fd870871227d9fd5be0f5664d685a0abdea7354


Trivial merge