[dali_1.9.9] Merge branch 'devel/master' 85/231885/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 24 Apr 2020 15:01:49 +0000 (16:01 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 24 Apr 2020 15:01:49 +0000 (16:01 +0100)
Change-Id: I431221904b2f425f85e58604b89006d81149e8aa


Trivial merge