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


Trivial merge