[dali_1.2.20] Merge branch 'devel/master'
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Dec 2016 10:46:50 +0000 (10:46 +0000)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Dec 2016 10:46:51 +0000 (10:46 +0000)
commitd13e8792c0e8dd0a3f5fb167ca9ee7c0155b7afc
tree23e95fa17dc7d54ea4683abcdb54fe95526502ec
parent675f5551ef3c7ca20ec45c36b865a5092883af43
parentf5da33acd1b9a04c5f37cb924d78778801f72929
[dali_1.2.20] Merge branch 'devel/master'

Change-Id: I7bd64ea0b5775f6103574e2e93ef93e24998667c