[dali_1.2.50] Merge branch 'devel/master' 31/141231/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Jul 2017 15:55:30 +0000 (16:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Jul 2017 15:55:30 +0000 (16:55 +0100)
Change-Id: I8821ef6744f09fc5403f415e9b7883a3d01f131b


Trivial merge