From: thothamon <jason.perry@partner.samsung.com>
Date: Thu, 24 May 2018 13:19:21 +0000 (+0100)
Subject: [dali_1.3.26] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~40
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F76%2F180076%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: If8a918599fe083be548df9943798e6e98a71750e
---

972f918dc8f8eac6ea2741b809bb4650b10a9373