[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)
commit2a9a5bb6aa155b49d939617b81cb107c8e6399f0
tree8688ad7754c236f81e9067278be22bd3606e6337
parent1396f5e795c16aaafb4cae934b30936273a33916
parente525c4e9dd5c34732a2b95960dda63975238080e
[dali_1.2.6] Merge branch 'devel/master'

Change-Id: I37469e96b3e96fe0c47e9ae0717d534df2d77631