[dali_1.2.11] Merge branch 'devel/master' 18/93318/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 21 Oct 2016 14:09:50 +0000 (15:09 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 21 Oct 2016 14:09:50 +0000 (15:09 +0100)
commit3e6769f502e8ce54a9ddd4579707438bb5827a62
treece23c60ac0e46902a1cd21337c5521fd4723a9a1
parent709f6618b60d366c84e259564c53b6ef0c43b717
parent2d21bbee4c6d092021c37e2b1ca5d6f6be14a9ea
[dali_1.2.11] Merge branch 'devel/master'

Change-Id: Id16261260dfdcb426a608977fb04729c75bba74c