From: Francisco Santos <f1.santos@samsung.com>
Date: Fri, 19 May 2017 12:43:59 +0000 (+0100)
Subject: [dali_1.2.40] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.21~170
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=502ac9a97635e43f801a67017ac33b33ce96109d

[dali_1.2.40] Merge branch 'devel/master'

Change-Id: Ic31d54afe7e25a14d8711a159dbcabec767d1897
---

502ac9a97635e43f801a67017ac33b33ce96109d