[dali_1.1.4] Merge branch 'devel/master' 15/48715/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Sep 2015 07:46:20 +0000 (08:46 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Sep 2015 07:46:20 +0000 (08:46 +0100)
commite542393b2651a05921e861f0440d83d10997f760
tree7a71c0b3adf8f90775391e68db477877a1d886a4
parent579e700d63e319e112613b33845f76e8d060d2dd
parent78412cb831eb701b74f66286b8e42124cde4fdbf
[dali_1.1.4] Merge branch 'devel/master'

Change-Id: I10c5967ddf6820698bbd18260cfa08fc3d2f7bee