[dali_1.2.55] Merge branch 'devel/master' 21/147221/1
authorUmar <m.umar@partner.samsung.com>
Fri, 1 Sep 2017 11:36:28 +0000 (12:36 +0100)
committerUmar <m.umar@partner.samsung.com>
Fri, 1 Sep 2017 11:36:28 +0000 (12:36 +0100)
commit64508ac7538924faee65ebdcfeb2d8b9effe0495
tree4a5d58864def555ae1dbe9ff5c3c417882df7fd0
parentc75a505d707cb81219f9fff043a5dea4b2fe6fbe
parentf62b4c7f19b7fe1a99a501064e1f540adfbccb57
[dali_1.2.55] Merge branch 'devel/master'

Change-Id: I244e61a888369a9c891eb095ed8abac23dd8f3bf