[dali_1.3.26] Merge branch 'devel/master' 74/180074/1
authorthothamon <jason.perry@partner.samsung.com>
Thu, 24 May 2018 13:18:58 +0000 (14:18 +0100)
committerthothamon <jason.perry@partner.samsung.com>
Thu, 24 May 2018 13:18:58 +0000 (14:18 +0100)
commit87faf4e28cb909decb65068b5e1ec9cf58d26743
tree264f114df464be8dda8189b3bcf31dc949f0d051
parentf9b298189acf7034afcc56a8412513a19746c515
parentd392a81422b7758a22f8d45e5b7b75b524053620
[dali_1.3.26] Merge branch 'devel/master'

Change-Id: Ie9802cbf58c85ad2a1478550b20f2da702db4a22