From: Nick Holland <nick.holland@partner.samsung.com>
Date: Fri, 12 Aug 2016 10:41:20 +0000 (+0100)
Subject: [dali_1.2.1] Merge branch 'devel/master'
X-Git-Tag: submit/trunk/20181001.110911~108
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F48%2F83848%2F1;p=platform%2Fcore%2Fuifw%2Fdali-core.git

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

Change-Id: I74540167a23dcc6bdb0edacd23eab2484ec32b32
---

d0641c99b5f097f199f6526881da79632c5ccaab