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


Trivial merge