[dali_1.1.21] Merge branch 'devel/master' 15/59315/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Feb 2016 10:33:02 +0000 (10:33 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Feb 2016 10:33:02 +0000 (10:33 +0000)
commitd1766e06ae2518d8c941170fe8e03c8a82de8c3e
tree8ef569eb73f67c2e842302a6ec61c8e4f20167fe
parentc284103e2575f3276ef70eee3953bea531484e29
parent413f5f72b91511a077891b3ef5531b4757f80a1a
[dali_1.1.21] Merge branch 'devel/master'

Change-Id: I57c848e415a6d08ce9ea20dcbc6744d065f6a048