[dali_1.4.34] Merge branch 'devel/master' 19/212619/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 23 Aug 2019 10:02:49 +0000 (11:02 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 23 Aug 2019 10:02:49 +0000 (11:02 +0100)
Change-Id: I6cfc09cf0192bcc3e64d37f3dacc2e7f7ee99655


Trivial merge