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


Trivial merge