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


Trivial merge