[dali_1.3.50] Merge branch 'devel/master' 57/193257/1
authoradam.b <adam.b@samsung.com>
Fri, 16 Nov 2018 12:21:55 +0000 (12:21 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 16 Nov 2018 12:21:55 +0000 (12:21 +0000)
commitf656a785b5bbf119c7e7c63500da219b838173a4
tree5f788602a8e973d2f6176b77ab3e1d15c026c0c1
parent6615c344f7515fa67e8d8b769290fef5140d8e9a
parentde1d1de3e9cd84d41155ea278a4a825bd00e124e
[dali_1.3.50] Merge branch 'devel/master'

Change-Id: I18bdf6815432eeb4d09bcca601ee5ca339964b4d