[dali_1.4.5] Merge branch 'devel/master' 83/199083/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Feb 2019 11:58:18 +0000 (11:58 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Feb 2019 11:58:18 +0000 (11:58 +0000)
Change-Id: I3cbe8a36ac32b0a2c28a892c1a4d9a15772a16fc


Trivial merge