[dali_1.2.32] Merge branch 'devel/master' 74/120874/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Mar 2017 11:51:29 +0000 (11:51 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Mar 2017 11:51:29 +0000 (11:51 +0000)
commit9a737a3670d68c5fabd8ffeecd3564f83ccc79f8
treedc53207f71a796ba352ab5d5b9ac1e974931ab2c
parent0e7b5f3cd5949d165850de59d0c3c1cff78f38a5
parentb7a7a9dcb8c4effcc0bff371d8cb601b9db6baeb
[dali_1.2.32] Merge branch 'devel/master'

Change-Id: I48b7a61562e16a251cda8e00ee73258c880396a2