From: taeyoon0.lee <taeyoon0.lee@samsung.com>
Date: Tue, 25 Apr 2017 05:15:13 +0000 (+0900)
Subject: Merge branch 'devel/master (1.2.36+)' into tizen
X-Git-Tag: accepted/tizen/unified/20170426.061802~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F78%2F126778%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge branch 'devel/master (1.2.36+)' into tizen

Change-Id: I664f2f2ba270b2fdba792a3ec2f85e3d703c062d
---

a6fd301319002f10517562895536217e8634bdce