[dali_1.3.40] Merge branch 'devel/master' 72/188672/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 7 Sep 2018 07:32:04 +0000 (08:32 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 7 Sep 2018 07:32:04 +0000 (08:32 +0100)
Change-Id: Ic9348ed1ad01da380513bea2749a4247e4f5bead


Trivial merge