From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Mon, 27 Mar 2017 07:50:57 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/common/20170327.143155~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=refs%2Fchanges%2F65%2F121165%2F1

Merge branch 'devel/master' into tizen

Change-Id: I2c9ab23125b39ee3fbfdd998e34b90a907ab78b5
---

70ec62b390d2a16a7d007d127301ad246b95b45c