[dali_1.0.28] Merge branch 'tizen' 61/35061/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 6 Feb 2015 11:51:41 +0000 (11:51 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 6 Feb 2015 11:51:41 +0000 (11:51 +0000)
Change-Id: I39213b0d1cc0b4d2d95d57ae8eee74e1a6242594


Trivial merge