[dali_1.4.9] Merge branch 'devel/master' 47/200747/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 1 Mar 2019 14:36:00 +0000 (14:36 +0000)
committergreynaga <g.reynaga@samsung.com>
Fri, 1 Mar 2019 14:36:00 +0000 (14:36 +0000)
Change-Id: Ic40d1f49d54ebad76704a828ee42d57b510052ea


Trivial merge