[dali_1.1.21] Merge branch 'devel/master' 13/59313/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Feb 2016 10:32:47 +0000 (10:32 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 12 Feb 2016 10:32:47 +0000 (10:32 +0000)
commit3ebd19dd0b1e9beec0b01da6ac6c812dc6f6b95c
tree04a4457e4f4778cd0dff7a0eb8036531e4db1f6e
parent252e273f4e0cedbf35c42a752213b5193d883f47
parent8cdde8f755c6dab43fcec5c9a68bb6c5b517a215
[dali_1.1.21] Merge branch 'devel/master'

Change-Id: I00e8d224899dc3d81c9810d7b27723e493214873