From: Xiangyin Ma <x1.ma@samsung.com>
Date: Fri, 28 Oct 2016 12:18:58 +0000 (+0100)
Subject: [dali_1.2.12] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~175
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=b15279dd1e820bebf41aeb78453f997fe50051ae

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

Change-Id: Iee3fb16d4cd87c14f8d21214ed424ded75317336
---

b15279dd1e820bebf41aeb78453f997fe50051ae