From: Ferran Sole <ferran.sole@samsung.com>
Date: Fri, 9 Dec 2016 14:36:08 +0000 (+0000)
Subject: [dali_1.2.18] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~169
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=ad2c68be894854b5dd91295039afebc21e659c3a;hp=-c

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

Change-Id: Iace460d2600b73182e9a7cdfc365ca277559a4e5
---

ad2c68be894854b5dd91295039afebc21e659c3a