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


Trivial merge