[dali_1.2.52] Merge branch 'devel/master' 40/143840/1
authorRichard Huang <r.huang@samsung.com>
Fri, 11 Aug 2017 11:44:53 +0000 (12:44 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 11 Aug 2017 11:44:53 +0000 (12:44 +0100)
commita41facb4288817010e2ad7793a3bc97fd9af1c92
tree5305ccbf4f5cea992da9854a7d2ba04b16d99ccf
parentb5ebd3f66b41381e00a7528cc9b0d8d41195e0d3
parentb50238eac74a0ef71d7a2a4835241d46ceb2ecc2
[dali_1.2.52] Merge branch 'devel/master'

Change-Id: Ib1f6316cc48200aa0d69b9a6f75121e3baccf73a