[dali_1.3.16] Merge branch 'devel/master' 85/172885/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 16 Mar 2018 11:52:43 +0000 (11:52 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 16 Mar 2018 11:52:43 +0000 (11:52 +0000)
Change-Id: I156e3199c6da8d96f851d4f47476e2c0e2a6743b


Trivial merge