[dali_1.3.29] Merge branch 'devel/master' 63/182363/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 22 Jun 2018 07:55:33 +0000 (08:55 +0100)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 22 Jun 2018 07:55:33 +0000 (08:55 +0100)
Change-Id: Ic3fe094f337c8deaa47fb2cb3411c3fb26179e4d


Trivial merge