[dali_1.1.25] Merge branch 'devel/master' 79/61979/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 11 Mar 2016 15:03:13 +0000 (15:03 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 11 Mar 2016 15:03:13 +0000 (15:03 +0000)
commit0f5c7c53ddfe1a2c27f3a6bac81b0c62c99954a0
tree845a585b38f6e43a105ce472bbe20d809a43cbd6
parentb899c4999231a14190e804e13b941527c3c437a1
parent748e31d36c07e45b75ffbfad770319c3f2909705
[dali_1.1.25] Merge branch 'devel/master'

Change-Id: I4d5ff62d4093b7af57147b9f4146ca601c7d79b4