[dali_1.0.17] Merge branch 'tizen' 67/30267/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 13 Nov 2014 11:29:30 +0000 (11:29 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 13 Nov 2014 11:39:31 +0000 (11:39 +0000)
commit8f2c7a1c1ad470b02521b862607a60d966e217f1
tree497fc3293992be5f8f07de422a2b7cfe8598f87f
parent7d955aff86a5045ee7bd8b7ccb2befe74864599b
parenta21ecdbbe44f842b93c6b9559fcc025f8f3b39c7
[dali_1.0.17] Merge branch 'tizen'

Change-Id: I4808a57c41d94af0b92e06679d22d8a88ff18494