[dali_1.4.30] Merge branch 'devel/master' 72/210972/1
authoradam.b <adam.b@samsung.com>
Fri, 26 Jul 2019 10:48:30 +0000 (11:48 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 26 Jul 2019 10:48:30 +0000 (11:48 +0100)
Change-Id: I9c1bb366de81bec48a394323aa3dfe28a079c51e


Trivial merge