[dali_1.2.21] Merge branch 'devel/master' 48/109048/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jan 2017 14:02:02 +0000 (14:02 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 6 Jan 2017 14:02:02 +0000 (14:02 +0000)
commite54f982e0aaf23db4c3002a3d9fe47a19737bb71
treecd3f0d467bdce0da1aac39b70af8385844c369a0
parentd13e8792c0e8dd0a3f5fb167ca9ee7c0155b7afc
parentb23ed2969a54cad3b9d21028878afc033be240f0
[dali_1.2.21] Merge branch 'devel/master'

Change-Id: I09b6363f91f4d7d95a2901e01db34a4b4b032ed1