[dali_1.2.61] Merge branch 'devel/master' 68/155568/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 13 Oct 2017 14:00:27 +0000 (15:00 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 13 Oct 2017 14:00:27 +0000 (15:00 +0100)
Change-Id: Idbeba52924ddcaefd27918ec02fe8e855f6b02b4


Trivial merge