[dali_1.3.6] Merge branch 'devel/master' 73/166073/1
authorRichard Huang <r.huang@samsung.com>
Fri, 5 Jan 2018 13:33:40 +0000 (13:33 +0000)
committerRichard Huang <r.huang@samsung.com>
Fri, 5 Jan 2018 13:33:40 +0000 (13:33 +0000)
commit01db027faaf245de80dfee0928fbd6f72360f7bd
treec62650c5696644e8433203b4ee3cc477bf51ec6d
parent96b966cf11945978a068524e45e86f9be8b19d3c
parenta3649356594c9aaaa7b2beb53ea893f73daea2db
[dali_1.3.6] Merge branch 'devel/master'

Change-Id: I8cfcb274c8cf93ac21e0d432733caaaa3e6e4c9a