[dali_1.4.3] Merge branch 'devel/master' 80/198080/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 18 Jan 2019 10:44:53 +0000 (10:44 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 18 Jan 2019 10:44:53 +0000 (10:44 +0000)
Change-Id: Id26d893e54342cdb237b637a9cd6b576a33a9c7b


Trivial merge