[dali_1.1.21] Merge branch 'devel/master' 16/59316/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Feb 2016 10:33:11 +0000 (10:33 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Feb 2016 10:33:11 +0000 (10:33 +0000)
commit269f620ad9d5a8c816a03278ce6f65fe7862582e
treecb804591e0168a02a02de56366460fcae8600767
parentc2cab8a32da3c02eee109ea1ee4481047e221f74
parenteb2a8f9272f3852dcadf02e9467267059b95ed53
[dali_1.1.21] Merge branch 'devel/master'

Change-Id: Iea3cd13f956b3aa0ace7ac97b78b4f215a3f93e7