[dali_1.1.1] Merge branch 'devel/master' 24/46824/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 26 Aug 2015 10:15:26 +0000 (11:15 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 26 Aug 2015 10:15:26 +0000 (11:15 +0100)
commit8da6b8a945b6a24dfa03f55ae4f2ad36e4bdf6f8
tree1ebede7afb8f43212178f631913798d10ec29e38
parentce369180b409dbdbb734de4727abebe04bb24a2c
parent787143e40ffd331b38ee04603124d29920a46eff
[dali_1.1.1] Merge branch 'devel/master'

Change-Id: Ie82817e14cd7ae8a260538acd8b7c9584675f27e