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


Trivial merge