[dali_1.2.5] Merge branch 'devel/master' 19/87819/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 9 Sep 2016 13:03:13 +0000 (14:03 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 9 Sep 2016 13:03:13 +0000 (14:03 +0100)
commit67599ff4ef2f566f532158645667a3849dccd503
tree6dab2bf85c0a42bbc773a7a79ea8a698f7ff731c
parenteb807cea85ad0fc8ebcbabb8ecfc3e4fe0388476
parent5b329e6779ce21be97a7e3305b6c57ca7dc70959
[dali_1.2.5] Merge branch 'devel/master'

Change-Id: I0e2d3ace33c6cc23cc72a86e20e9e2c523f502a4