[dali_1.2.6] Merge branch 'devel/master' 37/88337/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 16 Sep 2016 09:56:26 +0000 (10:56 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 16 Sep 2016 09:56:26 +0000 (10:56 +0100)
Change-Id: I37469e96b3e96fe0c47e9ae0717d534df2d77631


Trivial merge