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


Trivial merge