[dali_1.3.0] Merge branch 'devel/master' 14/160714/1
authoradam.b <adam.b@samsung.com>
Fri, 17 Nov 2017 14:47:03 +0000 (14:47 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 17 Nov 2017 14:47:03 +0000 (14:47 +0000)
commit9b0dbb24b7bc1263e5ffb302361db768de2b45f6
tree7a51ea663fb66ffd1ddf3781d9626313dde4c23f
parentdf990c43c3c47a0a1fe621fba51443911cd887a7
parent82ffd350eb6554febf4bd709a401689641de63a2
[dali_1.3.0] Merge branch 'devel/master'

Change-Id: I27fa89066cc4c79e784a7a4748b28c84171937c8