From: Heeyong Song <heeyong.song@samsung.com>
Date: Mon, 20 Mar 2017 01:51:52 +0000 (+0900)
Subject: Merge branch 'devel/master (1.2.31)' into tizen
X-Git-Tag: accepted/tizen/common/20170320.173913^0
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=commitdiff_plain;h=c5c50e6ad30e6d83fd3f28c462ae002ef6a4faab

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

Change-Id: I88bc17e9fcf8bcc520ef0d3196323ba00373746f
---

c5c50e6ad30e6d83fd3f28c462ae002ef6a4faab