[dali_1.3.31] Merge branch 'devel/master' 38/183538/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jul 2018 09:37:10 +0000 (10:37 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jul 2018 09:37:10 +0000 (10:37 +0100)
Change-Id: I266f125bac841ba714505ad236ad4c1d581b0625


Trivial merge