[dali_1.1.19] Merge branch 'devel/master' 49/58349/1
authorTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:22 +0000 (11:34 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 29 Jan 2016 11:34:22 +0000 (11:34 +0000)
commit934eb1128c4f51490490bd178caf8092bf7f6e1a
treef3f8bdd86e39d8d2d6576040b65f3108c660bc9d
parentd143329bbf55451e73772b589d2a7c3de401e4b0
parentd281c7ab2296f45de8813f7748f691daa04c8a3d
[dali_1.1.19] Merge branch 'devel/master'

Change-Id: Ie563a43897eb9b487dde2da36e93bc50fe05dfb4