[dali_1.2.60] Merge branch 'devel/master' 39/154139/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 6 Oct 2017 15:55:23 +0000 (16:55 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 6 Oct 2017 15:55:23 +0000 (16:55 +0100)
commit410125f32fcd135226a2a0a668b2855ea9e17a69
tree26bacdc6b718020a52ec2f576848c219ee39b94c
parent071652156baaadd2721fce1142ba71eb01057bc2
parentb51ee52850416e5afe4beb30c29f8c77684b5524
[dali_1.2.60] Merge branch 'devel/master'

Change-Id: I2994fa2040564870d0ef207f388c2cdb48acb09b