[dali_1.0.25] Merge branch 'tizen' 44/33844/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 15 Jan 2015 13:21:06 +0000 (13:21 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 15 Jan 2015 13:21:06 +0000 (13:21 +0000)
Change-Id: I5e503687778daf83473e1561a3b55cab588c6fb0


Trivial merge