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


Trivial merge