[dali_1.2.38] Merge branch 'devel/master' 96/128096/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:53:13 +0000 (10:53 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 5 May 2017 09:53:13 +0000 (10:53 +0100)
commit35fdc8178d134261b84f267e3e3fc397763f1c13
tree9e3fa2189652c659014dc69a142add828365cf2f
parent78142e288ab69bd408cbf04328532354a81f137a
parent3297b0f6bc987d2a8abdbc20258d99dd76cd1f04
[dali_1.2.38] Merge branch 'devel/master'

Change-Id: I361e74d90042ee9f1343b71a6db6eabd871136eb