[dali_1.3.30] Merge branch 'devel/master' 04/183004/1
authoradam.b <adam.b@samsung.com>
Fri, 29 Jun 2018 12:51:33 +0000 (13:51 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 29 Jun 2018 12:51:33 +0000 (13:51 +0100)
commit531332279ff739a6ab1fac152a521d11e467c812
treec590df5a2fafac2d25730a5eea5d7683c82a64a6
parent037105035b2a204701fedde9fd7dcaa8e95d658b
parent2a28d2b27b1e6d4de3be7dead21cc13b84f6e0ed
[dali_1.3.30] Merge branch 'devel/master'

Change-Id: I3235a284c8ff861f09b5365de76ebff7c50a2fa6