[dali_1.9.9] Merge branch 'devel/master' 87/231887/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 24 Apr 2020 15:02:08 +0000 (16:02 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 24 Apr 2020 15:02:08 +0000 (16:02 +0100)
Change-Id: Id444d5ca53611f84e98856bd03269cf6e3cf3da7


Trivial merge