[dali_1.1.3] Merge branch 'devel/master' 54/48354/1
authorXiangyin Ma <x1.ma@samsung.com>
Fri, 18 Sep 2015 10:03:36 +0000 (11:03 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Fri, 18 Sep 2015 10:03:36 +0000 (11:03 +0100)
commit583c6ba4c18747c53513146c42917321a71fe3a8
tree7b422461e26018adb3bd0799842b0f84a09c86f8
parent597b4e6dd665427be7d64db0ccbf873aafc16f52
parent585520728e51847e75ef2725f36aa4f046829d24
[dali_1.1.3] Merge branch 'devel/master'

Change-Id: I88dd0c88db9259ad8f73c06e6f51c3a29b690cc2