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


Trivial merge