From: Francisco Santos <f1.santos@samsung.com>
Date: Fri, 19 May 2017 12:44:14 +0000 (+0100)
Subject: [dali_1.2.40] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~147
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=c2c6ef4249c29f78bf92762137ec7b4eb7087ca6

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

Change-Id: I1f0451276501e19b07c4805f45b7241b03887c2d
---

c2c6ef4249c29f78bf92762137ec7b4eb7087ca6