[dali_1.1.15] Merge branch 'devel/master' 29/55429/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 23 Dec 2015 17:22:31 +0000 (17:22 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 23 Dec 2015 17:22:31 +0000 (17:22 +0000)
Change-Id: I6c9392da70d5f18179af2e6fc93bca24153d2a72


Trivial merge