[dali_1.0.26] Merge branch 'tizen' 57/34257/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 22 Jan 2015 10:49:03 +0000 (10:49 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 22 Jan 2015 10:49:03 +0000 (10:49 +0000)
commitd52ae4ba4bb4d2e7bcc72316033bb36439f272af
treee9a3a0480797884069ebf802cc7af1b2f4deda9f
parent3ac55f31db4ac83cd33791383339c9f0874ea10b
parent002317c5e722a330fa9ff40e0b3528fe962f0cd7
[dali_1.0.26] Merge branch 'tizen'

Change-Id: I0ef23635188591a643c3556415dc53b66011544f