[dali_1.2.48] Merge branch 'devel/master' 85/138985/1
authoradam.b <adam.b@samsung.com>
Fri, 14 Jul 2017 12:30:22 +0000 (13:30 +0100)
committeradam.b <adam.b@samsung.com>
Fri, 14 Jul 2017 12:30:22 +0000 (13:30 +0100)
commit08852f39e92948ae06e70c8ce2c65351a1308e40
treef4f1afbd6ca965b452413758a2420120921bf91c
parent71345347d11e9bd19925b7191e68a1f606aa60bc
parent88f01d60e9a122a14539c10100ab4f1bf6070b41
[dali_1.2.48] Merge branch 'devel/master'

Change-Id: I3c31aed793ca79db87198c3e0fd6736b48e0137a