From: Nick Holland <nick.holland@partner.samsung.com>
Date: Fri, 15 Jan 2016 14:41:22 +0000 (+0000)
Subject: [dali_1.1.17] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~216
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=0e5a634c6f20855c76a6e2f63049db37fcbad965

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

Change-Id: I532bbd312d2aa765254447d39f87fc7203b8bc44
---

0e5a634c6f20855c76a6e2f63049db37fcbad965