[dali_1.0.45] Merge branch 'devel/master' 63/41863/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 18 Jun 2015 11:14:55 +0000 (12:14 +0100)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 18 Jun 2015 11:14:55 +0000 (12:14 +0100)
commit577d26decfe241610f22fc92ea0019cd8ac5ceca
tree13f584a2e85190a30c88933a8b2f840da34af344
parent526a64a21247c78086bbee7a2bcc7ca13142f3ed
parent7d345a8c6979dc4c1869b8728a8cbfd73d21f10d
[dali_1.0.45] Merge branch 'devel/master'

Change-Id: Icbe86eb9cdf905e76d17e33fdf57e0a0e939db80