[dali_1.3.7] Merge branch 'devel/master' 64/166964/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 12 Jan 2018 14:07:15 +0000 (14:07 +0000)
committergreynaga <g.reynaga@samsung.com>
Fri, 12 Jan 2018 14:07:15 +0000 (14:07 +0000)
Change-Id: If2e39ca722506c8ac30a82180e73a6e6479415a2


Trivial merge