[dali_1.2.11] Merge branch 'devel/master' 17/93317/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 21 Oct 2016 14:09:44 +0000 (15:09 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 21 Oct 2016 14:09:44 +0000 (15:09 +0100)
commit155aed2977e317d1d70b9a6abffb0290f34ceb8d
tree19de43e5fd565d7b43920808aed9aa02e3e226f5
parentddd3fe6c06fc487dad0ace99684468b3d36fe4c4
parentfccb6fadb18ff642efcf9d1984d4a86767d39d15
[dali_1.2.11] Merge branch 'devel/master'

Change-Id: I98c1086ef435ccb9e4dc03bf37f3bdfa7a596ef4