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


Trivial merge