[dali_1.9.12] Merge branch 'devel/master' 08/233508/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 15 May 2020 05:53:02 +0000 (06:53 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 15 May 2020 05:53:02 +0000 (06:53 +0100)
Change-Id: If81025d810047c5bd22a8ce1fadb3bf32f213f4d


Trivial merge