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


Trivial merge