[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)
Change-Id: I00e8d224899dc3d81c9810d7b27723e493214873


Trivial merge