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


Trivial merge