[dali_1.2.50] Merge branch 'devel/master' 33/141233/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Jul 2017 15:55:53 +0000 (16:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Jul 2017 15:55:53 +0000 (16:55 +0100)
commit8e1d322d2e00dc0dfac611507fb1bd7cb72c96be
tree9e523f434650007cf60e77b5ab0e3b4449c4bad3
parent02870c79a025bde9a0fd603ef591a03bdde5e5d9
parentd2761d587dc0208e6527161171b2ee57870d0ffd
[dali_1.2.50] Merge branch 'devel/master'

Change-Id: Ia9f540043283fb4efae53d95f7e645d3bc622924