From: taeyoon <taeyoon0.lee@samsung.com>
Date: Wed, 28 Oct 2015 05:43:12 +0000 (+0900)
Subject: Merge branch 'devel/master (1.1.2 ~ 1.1.7)' into tizen
X-Git-Tag: submit/tizen/20151102.084015~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1dad752601b8f8b9c44e8c74dd535ee50d2c4335;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Merge branch 'devel/master (1.1.2 ~ 1.1.7)' into tizen

Change-Id: Id1a7388e648991759ade506fcbd46437a1491519
---

1dad752601b8f8b9c44e8c74dd535ee50d2c4335