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


Trivial merge