From: Tom Robinson <tom.robinson@samsung.com>
Date: Fri, 5 Aug 2016 13:52:41 +0000 (+0100)
Subject: [dali_1.2.0] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~187
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=4c9152e53ad2cc0f85c35288599c103192ed98d6

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

Change-Id: I1f5659b60490f5d4d8e7c74ac4d6c7b774861be7
---

4c9152e53ad2cc0f85c35288599c103192ed98d6