From: greynaga <g.reynaga@samsung.com>
Date: Fri, 14 Aug 2020 10:39:52 +0000 (+0100)
Subject: [dali_1.9.25] Merge branch 'devel/master'
X-Git-Tag: dali_2.2.31~147
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F96%2F241096%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: I2371bb66d9710420278d598c8c607ac136e1260a
---

8099edc8dcf744a11bec4064fec8f302aba09c26