[dali_1.4.38] Merge branch 'devel/master' 12/214312/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 20 Sep 2019 06:25:01 +0000 (07:25 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 20 Sep 2019 06:25:01 +0000 (07:25 +0100)
Change-Id: Iaa4aa93f473e8a47fd3122290453cfd490cb76da


Trivial merge