From: Nick Holland <nick.holland@partner.samsung.com>
Date: Fri, 21 Oct 2016 14:09:50 +0000 (+0100)
Subject: [dali_1.2.11] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~176
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=3e6769f502e8ce54a9ddd4579707438bb5827a62

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

Change-Id: Id16261260dfdcb426a608977fb04729c75bba74c
---

3e6769f502e8ce54a9ddd4579707438bb5827a62