[dali_1.1.34] Merge branch 'devel/master' 99/69499/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 13 May 2016 10:55:23 +0000 (11:55 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 13 May 2016 10:55:23 +0000 (11:55 +0100)
commitd873af0fadfeed106af125415442109cc553e30d
tree0589be4729fe1beb0e259463bc69c0d6c63df650
parentb936651d1ccf66163c2ed8e381229e8f3618cc7b
parent570ff503a34f8ae98651129d9b63ff15f5b62228
[dali_1.1.34] Merge branch 'devel/master'

Change-Id: I4772dedf341ec019bec3c0200c44342ef60341b0