[dali_1.3.1] Merge branch 'devel/master' 31/161631/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 24 Nov 2017 11:56:40 +0000 (11:56 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 24 Nov 2017 11:56:40 +0000 (11:56 +0000)
commitc665e2269d918ac6f77871a36034a9c0d2e7d1af
tree4aa6ed073771f37ed263b2670e709b4bc61cb69e
parent9f1428a7d55989550023bb908f7afd271014f7f5
parent55ba118f3695c3c08441dbaa8ac216b96c056558
[dali_1.3.1] Merge branch 'devel/master'

Change-Id: I5a4f4c4e75614216d8bb6904d56fdff9625e6ab3