[dali_1.3.51] Merge branch 'devel/master' 14/193714/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 23 Nov 2018 11:37:36 +0000 (11:37 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 23 Nov 2018 11:37:36 +0000 (11:37 +0000)
Change-Id: I7e72ff4e65088e613b39dcc80fc98d5661b9a21b


Trivial merge