[dali_1.0.18] Merger branch 'tizen' 78/30578/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 20 Nov 2014 13:17:05 +0000 (13:17 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 20 Nov 2014 13:17:33 +0000 (13:17 +0000)
Change-Id: I99523960cc013dbe9f170a7269d162b54f7a1cb9


Trivial merge