[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)
commit4dc37629dd59d48e00bf17496ba0b76fe137af0c
tree768afbc496dc044830f756eceaea0163855edddb
parentda2e24f853c2f463df2f4b743c3b2241a537cefd
parentf49afc5db08c3a33ed1cca51491695a32cb34bf8
[dali_1.2.29] Merge branch 'devel/master'

Change-Id: Ifbf4c6ef7a5a333b5cef9bcfeb0b69b068f0a84a