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

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

Change-Id: I74b46d605e6e990cb842aa4788286c1f33c1f88c
---

04a3e8019ce7c8c038fa632fa6b7cb0483f1d760