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


Trivial merge