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


Trivial merge