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


Trivial merge