[dali_1.2.2] Merge branch 'devel/master' 82/84582/1
authorFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 10:00:17 +0000 (11:00 +0100)
committerFerran Sole <ferran.sole@samsung.com>
Fri, 19 Aug 2016 10:00:17 +0000 (11:00 +0100)
commitaf6c53413323cc02dcf5985e1d856e27fa191c94
tree3600070f0f1bbb59562a0e124229759c39f56e92
parent59fe25e11e36624b9af9fe706ebfa68388ddf388
parent4de32de7108dc1cf34579217488b44987abbcb99
[dali_1.2.2] Merge branch 'devel/master'

Change-Id: I8982dceee284d864344c379961665b52f3980bfc