[dali_1.9.27] Merge branch 'devel/master' 31/242631/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 28 Aug 2020 10:12:07 +0000 (11:12 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 28 Aug 2020 10:12:07 +0000 (11:12 +0100)
Change-Id: I46a29786191b3e10f8205eea2b56c4637f553c26


Trivial merge