[dali_1.4.48] Merge branch 'devel/master' 02/219002/1
authoradam.b <adam.b@samsung.com>
Fri, 29 Nov 2019 12:17:39 +0000 (12:17 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 29 Nov 2019 12:17:39 +0000 (12:17 +0000)
Change-Id: I9fe1e2fccab2c3aa041eb965353bb6ee1e3fb2f3


Trivial merge