[dali_1.4.21] Merge branch 'devel/master' 40/206740/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 May 2019 06:07:13 +0000 (07:07 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 May 2019 06:07:13 +0000 (07:07 +0100)
Change-Id: Ifd23b9f26aca6bd56aa53b4dc38c1519a622ba3c


Trivial merge