[dali_1.1.32] Merge branch 'devel/master' 30/67930/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 29 Apr 2016 08:11:23 +0000 (09:11 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 29 Apr 2016 08:11:23 +0000 (09:11 +0100)
Change-Id: Id870d98184d1dd0b6c77ce901dfdf6bf167304d5


Trivial merge