[dali_1.3.52] Merge branch 'devel/master' 76/194276/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 30 Nov 2018 11:15:10 +0000 (11:15 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 30 Nov 2018 11:15:10 +0000 (11:15 +0000)
Change-Id: Iaf88c2ec7f6afcb561e41d8d3090b6ea2a806d8b


Trivial merge