[dali_1.1.4] Merge branch 'devel/master' 17/48717/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Sep 2015 07:46:35 +0000 (08:46 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Sep 2015 07:46:35 +0000 (08:46 +0100)
commitcdc8674ed30780c66be93cd712a4932c8443c252
tree45045aaca4c79fe7eb4a0d9cea52f640133d2ee0
parent5a06fb112e597dc2780ade446ae035ae15a5b037
parentfeeaf88ea0f60c8e26b1e63448b6c0ff4ecdfc62
[dali_1.1.4] Merge branch 'devel/master'

Change-Id: I7d620bb95b904588ad20fa2f4aea5264aee868aa