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


Trivial merge