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


Trivial merge