[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)
commit2f464a46f817893abd1f22e1f0cf27cbded5c8d0
tree704fdaac2187e388f57b3eebfba62f11b5dfbf1a
parent5ab4e968a037be9b4beb8c3864acee2b3ec8c006
parent36ad39ad4897f9f46b516834a351fde22ef9a8b9
[dali_1.0.18] Merger branch 'tizen'

Change-Id: I99523960cc013dbe9f170a7269d162b54f7a1cb9