[dali_1.2.51] Merge branch 'devel/master' 93/142593/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 4 Aug 2017 10:44:49 +0000 (11:44 +0100)
committergreynaga <g.reynaga@samsung.com>
Fri, 4 Aug 2017 10:44:49 +0000 (11:44 +0100)
Change-Id: I668cd85ffe0a0f2cd8d1e99964258499b6dc76fe


Trivial merge