[dali_1.0.39] Merge branch 'tizen' 48/38648/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 23 Apr 2015 11:04:57 +0000 (12:04 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 23 Apr 2015 11:04:57 +0000 (12:04 +0100)
Change-Id: I50aa9e717979370e80fb0312e68d4ec9c7f843ae


Trivial merge