[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)
commitc2cab8a32da3c02eee109ea1ee4481047e221f74
tree624215dbfd315c0f7cf564f340b853084a9eedf4
parent934eb1128c4f51490490bd178caf8092bf7f6e1a
parent1d35f77a172e6e6831dbdf976a057fe1caa60986
[dali_1.1.20] Merge branch 'devel/master'

Change-Id: I0a6e1b67d86d47360c012adf0dd57716666149f9