From: Xiangyin Ma <x1.ma@samsung.com>
Date: Fri, 5 Feb 2016 08:53:50 +0000 (+0000)
Subject: [dali_1.1.20] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~158
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c2cab8a32da3c02eee109ea1ee4481047e221f74;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: I0a6e1b67d86d47360c012adf0dd57716666149f9
---

c2cab8a32da3c02eee109ea1ee4481047e221f74