[dali_1.1.38] Merge branch 'devel/master' 20/74020/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 10 Jun 2016 10:49:04 +0000 (11:49 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 10 Jun 2016 10:49:04 +0000 (11:49 +0100)
Change-Id: Ie995ce8342cd34be613210b0934b43a51cf77600


Trivial merge