[dali_1.2.63] Merge branch 'devel/master' 51/158051/1
authorUmar <m.umar@partner.samsung.com>
Fri, 27 Oct 2017 11:11:38 +0000 (12:11 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 27 Oct 2017 11:11:38 +0000 (12:11 +0100)
Change-Id: I045345200b3c74965655b977d704852ef05c58f8


Trivial merge