[dali_1.0.25] Merge branch 'tizen' 46/33846/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 15 Jan 2015 13:21:21 +0000 (13:21 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 15 Jan 2015 13:21:21 +0000 (13:21 +0000)
commit3ac55f31db4ac83cd33791383339c9f0874ea10b
treec6ef764fcbdb591040635e1fa7e2cbba1f474d5c
parent03bab0584e6c982872d61128499fe8f4f0cb592a
parent1ab84d602b4c67ae2e81dddd4b86e9bbe19cf078
[dali_1.0.25] Merge branch 'tizen'

Change-Id: Ib645018b21702614804b85fd97e2e4489a81d194