[dali_1.0.25] Merge branch 'tizen' 47/33847/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 15 Jan 2015 13:21:26 +0000 (13:21 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 15 Jan 2015 13:21:26 +0000 (13:21 +0000)
commit59c9c4c08d372314099f24b569e343f487483e4c
tree652111305cde079009610f08f44f4213ebd445d6
parentfec9e67662e185e56ef6751c8b360f31506b7c62
parent2219612698a271f539494654fd808495bd42f2c7
[dali_1.0.25] Merge branch 'tizen'

Change-Id: Icf5bae36799179a57d8f4dd0c8e479b3058afe77