[dali_1.0.21] Merge branch 'tizen' 79/31879/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 11 Dec 2014 15:02:52 +0000 (15:02 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 11 Dec 2014 15:02:52 +0000 (15:02 +0000)
commit51be13eefa596a0ded6f0f9954e42ef6cafa8d9d
tree68664e7f5d46fc2a25ef93c624d68ed850a8db46
parent464ca4a6ebfcfa27ad3b59c9c2b5b1b3aad9cac1
parent1382165248cd1701df59ddfc0cd7e5af2632d0de
[dali_1.0.21] Merge branch 'tizen'

Change-Id: Iff95c116eb84e0a9b700fe96a1ba3547be0b26e4