[dali_1.0.26] Merge branch 'tizen' 58/34258/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 22 Jan 2015 10:49:08 +0000 (10:49 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 22 Jan 2015 10:49:08 +0000 (10:49 +0000)
commit40caab9ac26b3b2290e3c3d7dd33eef3bdc1bd11
tree5b01dacee14adbe205f8efdc2ed3a1e12985f687
parent59c9c4c08d372314099f24b569e343f487483e4c
parentda4e08b7372a928c6f4c358f4acd5518d2e4d04d
[dali_1.0.26] Merge branch 'tizen'

Change-Id: Ibf0f060faa8b643b65f5cc0cbb63b96819a98dac