[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)
Change-Id: Ib645018b21702614804b85fd97e2e4489a81d194


Trivial merge