[dali_1.4.3] Merge branch 'devel/master' 83/198083/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 18 Jan 2019 10:45:23 +0000 (10:45 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 18 Jan 2019 10:45:23 +0000 (10:45 +0000)
Change-Id: I9b7aa08bffb23ca3aa1eb03c67043c252454d1cd


Trivial merge