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


Trivial merge