[dali_1.3.52] Merge branch 'devel/master' 72/194272/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 30 Nov 2018 11:14:32 +0000 (11:14 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 30 Nov 2018 11:14:32 +0000 (11:14 +0000)
Change-Id: Ib064bdd33aaa8f5c8bfa11a126dacb2a964a2ef0


Trivial merge