[dali_1.2.13] Merge branch 'devel/master' 70/95770/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:16:39 +0000 (13:16 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:16:39 +0000 (13:16 +0000)
commit140fc4e567fa70d1fac89b50cf67b530a4dae0af
tree300e4548df71042f9fc79093f80a7e3e2bf4e42d
parentb15279dd1e820bebf41aeb78453f997fe50051ae
parent3b60a42a098822430b63e166cac8da9cea515213
[dali_1.2.13] Merge branch 'devel/master'

Change-Id: I2a13e4b4094795b2e21ac2504e24eabf1f251275