[dali_1.2.57] Merge branch 'devel/master' 95/150395/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 15 Sep 2017 10:10:22 +0000 (11:10 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 15 Sep 2017 10:10:22 +0000 (11:10 +0100)
Change-Id: I09691dcbb1dea8b180633cdfb721e21e6ba8aa16


Trivial merge