[dali_1.1.29] Merge branch 'devel/master' 26/65326/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 8 Apr 2016 10:25:14 +0000 (11:25 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 8 Apr 2016 10:25:14 +0000 (11:25 +0100)
commit5437f8308b17393381dcf586e2a9aadd9aa4bdf3
tree9284a58fcfebfada91072ae4a949c57a3499c9dc
parent5253e9e87aa853a60b624b1a342a19ebca26f7a4
parent56f4cd606601820e4ea20059dc909fc701584474
[dali_1.1.29] Merge branch 'devel/master'

Change-Id: I10e304291306a3ff634c2423a686d53ffbb92c8f