From: taeyoon <taeyoon0.lee@samsung.com>
Date: Tue, 9 Aug 2016 11:32:48 +0000 (+0900)
Subject: Merge branch 'devel/master (1.2.0)' into tizen
X-Git-Tag: accepted/tizen/common/20160830.150353~32
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=9851bf19ae796af52a397dd19c234b91999cb1cb

Merge branch 'devel/master (1.2.0)' into tizen

Change-Id: Iafdbae903af3374dd58d83353a3af69da3b6da04
---

9851bf19ae796af52a397dd19c234b91999cb1cb