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


Trivial merge