From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Fri, 20 Jan 2017 02:34:39 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/ivi/20170120.082218~10
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb03b3ebb919a211ba6ba01d0a284eef02f1022a;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge branch 'devel/master' into tizen

Change-Id: I72c14c4b16a6864ef3a6145816dd12dd5dffdc8b
---

fb03b3ebb919a211ba6ba01d0a284eef02f1022a