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


Trivial merge