[dali_1.1.39] Merge branch 'devel/master' 30/75330/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 17 Jun 2016 10:44:25 +0000 (11:44 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 17 Jun 2016 10:44:25 +0000 (11:44 +0100)
Change-Id: Ib6b264ae8ac7cb4db6f03cc78d2300cee2d2ee3b


Trivial merge