From: Xiangyin Ma <x1.ma@samsung.com>
Date: Fri, 28 Oct 2016 12:19:18 +0000 (+0100)
Subject: [dali_1.2.12] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~120
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F94373%2F1;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: Icdce160338bab16c9065ef87108b8031f0df8aec
---

20dc7bbe285c1143911f2103af3bcb8de6fad985