[dali_1.2.32] Merge branch 'devel/master' 77/120877/1
authorVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Mar 2017 11:52:16 +0000 (11:52 +0000)
committerVictor Cebollada <v.cebollada@samsung.com>
Fri, 24 Mar 2017 11:52:16 +0000 (11:52 +0000)
commitb4e387c7e0bf73c2892f8a8c1d375faf05ee11c1
tree55183bde96ae15198757fd5882cf652b141e2160
parent509b74e5c9b99d480354811bbf32ea44373560e8
parent5a7562f2b2e0d53e5ce43b35b040eeb81a849f28
[dali_1.2.32] Merge branch 'devel/master'

Change-Id: I977ad141cb18f7b9538f3360b99e5c68aa8b910d