[dali_1.2.29] Merge branch 'devel/master' 95/117295/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 3 Mar 2017 14:07:06 +0000 (14:07 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 3 Mar 2017 14:07:06 +0000 (14:07 +0000)
Change-Id: Idd04b72191ed1480b34b804544c04dbb196c4209


Trivial merge