From: Lee Morgan <Lee.morgan@partner.samsung.com>
Date: Wed, 20 Aug 2014 14:06:35 +0000 (+0100)
Subject: [dali_1.0.5] Merge branch 'tizen'
X-Git-Tag: dali_1.0.7~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=324802158c7e91dbbf67c39af7ba476689343a6c;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

[dali_1.0.5] Merge branch 'tizen'

Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>
Change-Id: Ib4001d8f81d0c994a1eae038435605299d1803bb
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>
---

324802158c7e91dbbf67c39af7ba476689343a6c