From: greynaga <g.reynaga@samsung.com>
Date: Fri, 13 Oct 2017 14:00:55 +0000 (+0100)
Subject: [dali_1.2.61] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~71
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F155570%2F1;hp=-c;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: I160a9cde85c40723834dea23fdf0288a672c629c
---

9879c76252b384906ea35422547840350a72019c