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


Trivial merge