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


Trivial merge