[dali_1.1.35] Merge branch 'devel/master' 55/70755/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 20 May 2016 10:18:03 +0000 (11:18 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 20 May 2016 10:18:03 +0000 (11:18 +0100)
commit5eac31f2add56f5fd5b80b8e20cb65344626e590
tree9b87413cac7a8defc0fb8ae79e4c0d7c3a81c55f
parent651a66a2dfe9c92d669c1ba6a7e192ca1fff8085
parent0c044f7267adf86ddda4607f6894833d7568a102
[dali_1.1.35] Merge branch 'devel/master'

Change-Id: Ic0491ebd32f324c1841b86eda9901022b558261b