[dali_1.1.20] Merge branch 'devel/master' 52/58952/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 5 Feb 2016 08:53:50 +0000 (08:53 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 5 Feb 2016 08:53:50 +0000 (08:53 +0000)
Change-Id: I0a6e1b67d86d47360c012adf0dd57716666149f9


Trivial merge