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


Trivial merge