[dali_1.2.28] Merge branch 'devel/master' 53/116453/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 24 Feb 2017 09:35:14 +0000 (09:35 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 24 Feb 2017 09:35:14 +0000 (09:35 +0000)
Change-Id: Icbfadd4e5f5b6aae9e82a566643460999bc2d241


Trivial merge