[dali_1.3.15] Merge branch 'devel/master' 84/172084/1
authorgreynaga <g.reynaga@samsung.com>
Fri, 9 Mar 2018 14:12:28 +0000 (14:12 +0000)
committergreynaga <g.reynaga@samsung.com>
Fri, 9 Mar 2018 14:12:28 +0000 (14:12 +0000)
Change-Id: Idab5860964b8848f1bf5330d7fffbbe2f60edad9


Trivial merge