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


Trivial merge