[dali_1.4.29] Merge branch 'devel/master' 73/210473/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 19 Jul 2019 08:52:18 +0000 (09:52 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 19 Jul 2019 08:52:18 +0000 (09:52 +0100)
Change-Id: I2914596887ac5c39ca038d95954db1fbbaaa24c6


Trivial merge