[dali_1.3.21] Merge branch 'devel/master' 60/176660/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 20 Apr 2018 10:59:01 +0000 (11:59 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 20 Apr 2018 10:59:01 +0000 (11:59 +0100)
Change-Id: I4c6de45ef75759c2eaafdeb5610630f28ee90b55


Trivial merge