[dali_1.1.31] Merge branch 'devel/master' 71/66971/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Apr 2016 09:08:20 +0000 (10:08 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 22 Apr 2016 09:08:21 +0000 (10:08 +0100)
Change-Id: I917c81f226465bda2f540b2e7e9ddefece9c210f


Trivial merge