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


Trivial merge