[dali_1.3.4] Merge branch 'devel/master' 40/164140/1
authorFrancisco Santos <f1.santos@samsung.com>
Fri, 15 Dec 2017 11:19:59 +0000 (11:19 +0000)
committerFrancisco Santos <f1.santos@samsung.com>
Fri, 15 Dec 2017 11:20:00 +0000 (11:20 +0000)
commit8e7b79aa32faa45e8a231c7b3e413d7ad1783acf
treeb708d1a2cdc4dc2d8e42d2f8ea06dfaafcae1dce
parentf239ed3057d35078c92adf007ea263942a4f2650
parenta4fde166a980a76cf2b4d6bdd52e55db8ad48afd
[dali_1.3.4] Merge branch 'devel/master'

Change-Id: I43ee70a927b0f5dd3431be8fd2d30057ffe9cd04