From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Tue, 13 Jun 2017 01:58:22 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20170614.141244~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F80%2F133580%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge branch 'devel/master' into tizen

Change-Id: Id6c15bc1aa2b37eb582c6c6246079517d7044b25
---

3271f8d51def5bfba8c855fdc31df640124b9294