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


Trivial merge