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


Trivial merge