[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)
commitd8dacbc930312acccf0f89cc69adb033ad7ae1a3
treee809fda92dccf93d872033751930590b8ed701c1
parent293c1d907224738195c2abd89ed5f24e1c825e03
parent1aa6e0c96e1977dc188978030ab9425536790814
[dali_1.2.57] Merge branch 'devel/master'

Change-Id: I09691dcbb1dea8b180633cdfb721e21e6ba8aa16