[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)
Change-Id: I7d77e0d851c8af079ce2d3f64f22d85b9d8c4d17


Trivial merge