[dali_1.1.1] Merge branch 'devel/master' 22/46822/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 26 Aug 2015 10:15:16 +0000 (11:15 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 26 Aug 2015 10:15:16 +0000 (11:15 +0100)
commitef3158159e827347a70e29e2c234e2eb0917f4b6
treed2201c95bad5a0ac7a1667911b4ea3243fe5327c
parentdfb6ffc9f117ae740c30e067a878e28bca0a4369
parent13be1f125927160f5fd7f4d9ed3be65213d3a532
[dali_1.1.1] Merge branch 'devel/master'

Change-Id: Ied05117f28d79fae2e4a28d48bd0ffc4e79fd9c4