[dali_1.2.60] Merge branch 'devel/master' 37/154137/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 6 Oct 2017 15:55:02 +0000 (16:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 6 Oct 2017 15:55:02 +0000 (16:55 +0100)
commit535b79b009584a50ba73f2a01b553108eefc4488
treebc23ae91bf4ca42a3518eef8256f8196d70d6a59
parenta3436e42921ecf4a9b885152742194b47d48d7c9
parentbaafe4d2fa0a0933f756f3799a0278013b21f312
[dali_1.2.60] Merge branch 'devel/master'

Change-Id: Iab54cf5acca439b4739f6c1e4aca6a51cfdeb1bc