[dali_1.2.34] Merge branch 'devel/master' 97/123897/1
authorNick Holland <nick.holland@partner.samsung.com>
Fri, 7 Apr 2017 10:11:56 +0000 (11:11 +0100)
committerNick Holland <nick.holland@partner.samsung.com>
Fri, 7 Apr 2017 10:11:56 +0000 (11:11 +0100)
commitdc74c6ba8a95a2a48ee112d20e39494e116021b1
tree18d11a4b8579f23d66b99b19349cd58fab21e581
parenta5c87483d20a24891a2507b98c95a2569b16e1e1
parent5a8be21693cf3b5d251361b09220845d2fcfd8f7
[dali_1.2.34] Merge branch 'devel/master'

Change-Id: I314d4c1087cbcd5a43a49ad36bdd5395e309d1e9