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


Trivial merge