From: Lee Morgan <Lee.morgan@partner.samsung.com>
Date: Fri, 23 Oct 2015 10:00:59 +0000 (+0100)
Subject: [dali_1.1.7] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~226
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F39%2F50039%2F1;hp=-c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

[dali_1.1.7] Merge branch 'devel/master'

Change-Id: I51e2dd26cb5e210757d50acdfe40e664cc572206
---

99d04e7ae5ea38bdbe4f211d9e2592d3422ae8af