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


Trivial merge