[dali_1.1.4] Merge branch 'devel/master' 18/48718/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Sep 2015 07:46:40 +0000 (08:46 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 25 Sep 2015 07:46:40 +0000 (08:46 +0100)
commit2cae846d16036e641287295af0c8557abd5b9617
tree9d75f4f576c6c0a0aff4337596343e3e2db8d250
parenta2cfdf761c681e729847c2b64c742d87ada8c6c5
parent20f49784fb76699d649d2f77239ac449442a75a5
[dali_1.1.4] Merge branch 'devel/master'

Change-Id: I7f47ab256aadbcae617e5e4cf5d871ec1a2f669c