From: adam.b <adam.b@samsung.com>
Date: Fri, 21 Apr 2017 11:30:32 +0000 (+0100)
Subject: [dali_1.2.36] Merge branch 'devel/master'
X-Git-Tag: dali_1.9.8~5^2~151
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6e05d2da56fde9a67ff3ead673493879deaab301

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

Change-Id: Ied3db40ab93fc8d57b4f6a3204369585d4ea5b4c
---

6e05d2da56fde9a67ff3ead673493879deaab301