[dali_1.2.56] Merge branch 'devel/master' 63/148663/1
authoradam.b <adam.b@samsung.com>
Fri, 8 Sep 2017 08:28:11 +0000 (09:28 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 8 Sep 2017 08:28:11 +0000 (09:28 +0100)
commitf06a2008293be70a6ae7ff89d45b52f4d49d0fc0
tree630eab3515193c2e3c6c42b4eb93905925486653
parentb841244c9f5ca50f066d91b5b381044f33b2bdf6
parentc0b60f6848796c6b4f1789db9ab02025b0f086ab
[dali_1.2.56] Merge branch 'devel/master'

Change-Id: I71175275e071110a665469362684c2b8ea997717