[dali_1.2.55] Merge branch 'devel/master' 20/147220/1
authorUmar <m.umar@partner.samsung.com>
Fri, 1 Sep 2017 11:36:12 +0000 (12:36 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 1 Sep 2017 11:36:12 +0000 (12:36 +0100)
commitb841244c9f5ca50f066d91b5b381044f33b2bdf6
tree5cc8d7a75ea8f390ee6dc1402b7c49e5c187f9f4
parentd9556f0576ca28a4d1189fa3b09fed0333a4bd49
parent0e3aa6bcb76b7deccbb1b1cb983dcf2a1ec56d31
[dali_1.2.55] Merge branch 'devel/master'

Change-Id: I0527eda1f54bb786913b1e1dfc6a72f2c6b66740