[dali_1.2.50] Merge branch 'devel/master' 30/141230/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Jul 2017 15:55:14 +0000 (16:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Jul 2017 15:55:14 +0000 (16:55 +0100)
commitf17058692ef50453bbacf7ba4c682c1c5918559f
tree414a256550342e188a94d689f482f38a499b7b34
parentf9547829266790f2cdeea51dea9cf9454e7bde1d
parent8638e3431ac3dba7c92fd46f5bc07f66622c436d
[dali_1.2.50] Merge branch 'devel/master'

Change-Id: I8fd90d73e94897932c20b397b33cc318ffd5040a