[dali_1.2.13] Merge branch 'devel/master' 69/95769/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:16:23 +0000 (13:16 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 4 Nov 2016 13:16:23 +0000 (13:16 +0000)
commited5b970f9108e0a63e1e7af5ffc7e1eee7f73a8b
treee8cad3d7a9704493658533982dd8b369d72e4f08
parent34f8c5cfcbfec520584ce611b6d883810d35fb72
parent97e9e0d0b733f95696987bbcbe7f93891a7aab7a
[dali_1.2.13] Merge branch 'devel/master'

Change-Id: I017c9464846bd58c93d8a2fad3852c4354710d19