From: Heeyong Song <heeyong.song@samsung.com>
Date: Mon, 20 Mar 2017 02:18:24 +0000 (+0900)
Subject: Merge branch 'devel/master (1.2.31)' into tizen
X-Git-Tag: accepted/tizen/common/20170320.173824~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F18%2F119718%2F1;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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

Change-Id: I2299bb458b68e615f1f3d69f38a9481bb6b5c7be
---

638ea9c728e0c0617cd333c305df055ff61b302e