[dali_1.2.15] Merge branch 'devel/master' 33/98733/1
authorUmar <m.umar@partner.samsung.com>
Fri, 18 Nov 2016 10:59:26 +0000 (10:59 +0000)
committerUmar <m.umar@partner.samsung.com>
Fri, 18 Nov 2016 10:59:26 +0000 (10:59 +0000)
commit971b11c17515c2f052f778d2e432e062738a99d7
tree47d3f3d2acb334f2d73c6aef5203a31372eedad5
parent0646a5db2ded58d48c6cf3d2ca8ba60fc84d4821
parenta4b20502030c575142a464e5c2f1384c74d3a151
[dali_1.2.15] Merge branch 'devel/master'

Change-Id: If38951299ed9e878247ee3e38c0d5db166ccf473