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


Trivial merge