[dali_1.2.29] Merge branch 'devel/master' 96/117296/1
authorAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 3 Mar 2017 14:07:21 +0000 (14:07 +0000)
committerAgnelo Vaz <agnelo.vaz@samsung.com>
Fri, 3 Mar 2017 14:07:21 +0000 (14:07 +0000)
commite1d3366cda5ce5fabc3f5117b67409d748d6b03d
tree4d36cae7045f74640ce8ef82992bf7b7945bc514
parent6058e0e734f5b316fd8f8f622e87bfaeb6ca96b4
parentb9f64e01ced51fd55219df457a2a9962d8bba5d4
[dali_1.2.29] Merge branch 'devel/master'

Change-Id: I7ebd7deac5d2d6b575f8f7fec2b9c1f620d4efa2