[dali_1.4.40] Merge branch 'devel/master' 85/215285/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 4 Oct 2019 12:41:21 +0000 (13:41 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 4 Oct 2019 12:41:21 +0000 (13:41 +0100)
Change-Id: I9026d9b8670c6fac28a51e42fec94cb8acf1fae7


Trivial merge