[dali_1.3.8] Merge branch 'devel/master' 03/167703/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 19 Jan 2018 08:16:39 +0000 (08:16 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 19 Jan 2018 08:16:40 +0000 (08:16 +0000)
Change-Id: I745468ec2009d1d5294d6c6714c2833a767e1219


Trivial merge