[dali_1.2.29] Merge branch 'devel/master' 97/117297/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 3 Mar 2017 14:07:40 +0000 (14:07 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 3 Mar 2017 14:07:40 +0000 (14:07 +0000)
commit94d678d62ca15faaced5deaf379f9ea4a6f16b7d
treecb148676809b0d3e2675c9f0e6abb87514e53a5f
parent92599bec00306761453eeaaa2a212fbc44ec0ba8
parent3dcfa7a9bb924d538d5ddc3ae3973b9728740a5d
[dali_1.2.29] Merge branch 'devel/master'

Change-Id: I1409c2df0c9f782dfda16343b181a3088cb795c0