From: Nick Holland <nick.holland@partner.samsung.com>
Date: Fri, 7 Apr 2017 10:11:56 +0000 (+0100)
Subject: [dali_1.2.34] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.21~176
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=dc74c6ba8a95a2a48ee112d20e39494e116021b1

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

Change-Id: I314d4c1087cbcd5a43a49ad36bdd5395e309d1e9
---

dc74c6ba8a95a2a48ee112d20e39494e116021b1