From: Jinho, Lee <jeano.lee@samsung.com>
Date: Mon, 17 Apr 2017 02:29:02 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/unified/20170418.072553~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F35%2F125435%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge branch 'devel/master' into tizen

Change-Id: I48437acbcea44f7a7964c99751ba503dd6a43bc9
---

b03bd6fd1e8812702e50d0c84e7a617998fd5082