[dali_1.1.20] Merge branch 'devel/master' 49/58949/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 5 Feb 2016 08:53:30 +0000 (08:53 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 5 Feb 2016 08:53:30 +0000 (08:53 +0000)
commit252e273f4e0cedbf35c42a752213b5193d883f47
tree5914546e5077ac8ce7f2b591dbb824ad0e45fe1c
parentd894f394cfdeea4e482b0666fe25d6039dca6bcb
parenta4ff99d285d9d03f260e5793750e96a7d1f729bd
[dali_1.1.20] Merge branch 'devel/master'

Change-Id: I7d77e0d851c8af079ce2d3f64f22d85b9d8c4d17