[dali_1.1.38] Merge branch 'devel/master' 18/74018/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 10 Jun 2016 10:48:48 +0000 (11:48 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 10 Jun 2016 10:48:48 +0000 (11:48 +0100)
commit0acf86940102760a173238655fa8449d955c567d
tree437bc0b4ad43b9c80a551ac9ff29523cbd65bbd5
parent2fcaaa684151cfffd691bd33a534cb53b1f53e5e
parent2b5dfa71b670df667f92cd29c2a8fb94e7db6db2
[dali_1.1.38] Merge branch 'devel/master'

Change-Id: If3b13481ac18313c59ef8c83d36cfacffd1ce173