[dali_1.2.47] Merge branch 'devel/master' 54/137754/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 7 Jul 2017 10:21:36 +0000 (11:21 +0100)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 7 Jul 2017 10:21:36 +0000 (11:21 +0100)
commit71345347d11e9bd19925b7191e68a1f606aa60bc
tree42803bb422c98b9290a05f55383939330c23198a
parentc2820c206ade88f7d3266f5b246328c58355fea2
parentf53e80d9150c6e7cde817028dc9f31d053f52516
[dali_1.2.47] Merge branch 'devel/master'

Change-Id: Ibe215d76eb91247d36639129f50beadc071877fc