From: taeyoon0.lee <taeyoon0.lee@samsung.com>
Date: Tue, 25 Apr 2017 06:29:58 +0000 (+0900)
Subject: Merge branch 'devel/master (1.2.36+)' into tizen
X-Git-Tag: accepted/tizen/unified/20170426.061756~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=58c6def73d5d1180527e2d0f6fe839cf112d11d4

Merge branch 'devel/master (1.2.36+)' into tizen

Change-Id: I02bd0acfb1c23ad694b517af34ece69c200d87a6
---

58c6def73d5d1180527e2d0f6fe839cf112d11d4