From: Francisco Santos <f1.santos@samsung.com>
Date: Fri, 25 Aug 2017 10:49:26 +0000 (+0100)
Subject: [dali_1.2.54] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.21~156
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F48%2F146248%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

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

Change-Id: I584917fd6f5c31847b9ca29873256680ff6aa3a8
---

68a3f49a1d9baad56c9424e49e012436f307d14a