[dali_1.3.50] Merge branch 'devel/master' 58/193258/1
authoradam.b <adam.b@samsung.com>
Fri, 16 Nov 2018 12:22:07 +0000 (12:22 +0000)
committeradam.b <adam.b@samsung.com>
Fri, 16 Nov 2018 12:22:07 +0000 (12:22 +0000)
commitc15672f86020b182e14533ff7a398b255e8d27f1
tree7f2cbacdc87cf9dfe0c1a020c15efe0e538ee5c0
parent71cf2e93c6219b9dd75800d5ebbf85ac15dc28ec
parentde2b1cdb9471cc29a37281b5660def10d47f6c16
[dali_1.3.50] Merge branch 'devel/master'

Change-Id: Id960f372ed013b0d480d958536dbd625633908fa