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


Trivial merge