[dali_1.3.16] Merge branch 'devel/master' 87/172887/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 16 Mar 2018 11:53:08 +0000 (11:53 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 16 Mar 2018 11:53:08 +0000 (11:53 +0000)
Change-Id: I1436b320abec78b92add349456ffef2207f661d0


Trivial merge