[dali_1.1.14] Merge branch 'devel/master' 39/54139/1
authorDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2015 14:42:37 +0000 (14:42 +0000)
committerDavid Steele <david.steele@samsung.com>
Fri, 11 Dec 2015 14:42:37 +0000 (14:42 +0000)
commit2db41d48e4cf67acc19ff6b39d540e5c7edf0b07
tree711233027b6a2ac9d542a60d72a71791d6a6dfe5
parentc55660c249e1ebe67719430e59face412974e475
parentd083dff4422449b01003ecc7639a286d92824886
[dali_1.1.14] Merge branch 'devel/master'

Change-Id: I94f71cafbb9905ca9fbe6aee30a74be2fddd454f