[dali_1.2.62] Merge branch 'devel/master' 05/156905/1
authorRichard Huang <r.huang@samsung.com>
Fri, 20 Oct 2017 11:43:32 +0000 (12:43 +0100)
committerRichard Huang <r.huang@samsung.com>
Fri, 20 Oct 2017 11:43:32 +0000 (12:43 +0100)
commitf16dfe6236b8ca2408247d4ce239dfd9e33c7229
tree86e449f339beec5e3e1c0ccfb12cbb8c79b4354e
parentafa7ce29cc34aa631272ce5569b4298aa00490bf
parentee0088646e9efa99af2700210973736bc6083df8
[dali_1.2.62] Merge branch 'devel/master'

Change-Id: I04727e1738dd61d6e67a91c467c9245e343e739b