[dali_1.2.56] Merge branch 'devel/master' 64/148664/1
authoradam.b <adam.b@samsung.com>
Fri, 8 Sep 2017 08:28:29 +0000 (09:28 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 8 Sep 2017 08:28:29 +0000 (09:28 +0100)
commit05cc71ede06f80b9ff7e056ac64e1498334e3cb2
tree0f6d8f550c050e52380f34a11c9d34abacf32eab
parent64508ac7538924faee65ebdcfeb2d8b9effe0495
parent90c1d496ded36ca40783d8f5e61da24a2e9be380
[dali_1.2.56] Merge branch 'devel/master'

Change-Id: I961a184a0db84626a2007a1a33bf60f24310137e