[dali_1.2.60] Merge branch 'devel/master' 38/154138/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 6 Oct 2017 15:55:17 +0000 (16:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 6 Oct 2017 15:55:17 +0000 (16:55 +0100)
commite54576f7b80885044d67ec147ab2742e31b75546
treedef21050782c4c6beb4d00e8f634391f1b1e8177
parent6878b6a46c51814c7ae4096980ffd6700cdd2a69
parent274b4d9fe60679e7ba0865c2b8997403630fbe12
[dali_1.2.60] Merge branch 'devel/master'

Change-Id: I2a5ef64e2dfade10df52ace7f80baa0840aaed06