[dali_1.0.26] Merge branch 'tizen' 56/34256/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 22 Jan 2015 10:48:52 +0000 (10:48 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 22 Jan 2015 10:48:52 +0000 (10:48 +0000)
commitff78ee214a0617ee31205530f13f910ced4136f4
treead6b9926c25c01fe96cbe9f809471e5d60f187c2
parentba9cd54a57e5f69ca633541b0932513fa2cade0e
parent3a66377b863448d8521cb262815e0d2aac7e5e4f
[dali_1.0.26] Merge branch 'tizen'

Change-Id: I411d40108033a927691c31f73de76fc6d8eeb47b