From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Wed, 4 Jan 2017 06:09:56 +0000 (+0900)
Subject: Merge branch 'devel/master' into tizen
X-Git-Tag: accepted/tizen/common/20170123.182454~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=99889f05f4b957e4664ecd67a118b287078c6752;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

Merge branch 'devel/master' into tizen

- Integration 1.2.18 -> 1.2.20 (Version up)

Change-Id: I3104bc41564c340e5dbb3155d27382222d8651e6
---

99889f05f4b957e4664ecd67a118b287078c6752