From: Richard Huang <r.huang@samsung.com>
Date: Fri, 14 Oct 2016 13:17:55 +0000 (+0100)
Subject: [dali_1.2.10] Merge branch 'devel/master'
X-Git-Tag: dali_1.4.10~122
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f391811faf0b99b43abb358791b85a658dfc7b30;p=platform%2Fcore%2Fuifw%2Fdali-demo.git

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

Change-Id: Ifa98519084d36ef1121682fcdc9ca29d9c8ce8ea
---

f391811faf0b99b43abb358791b85a658dfc7b30