[dali_1.2.43] Merge branch 'devel/master' 91/133291/2
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 9 Jun 2017 12:53:36 +0000 (13:53 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 9 Jun 2017 12:53:36 +0000 (13:53 +0100)
Change-Id: I25f44c4135a2a802f3d5f713a52301e17e4b48b4


Trivial merge