[dali_1.0.25] Merge branch 'tizen' 45/33845/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 15 Jan 2015 13:21:16 +0000 (13:21 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 15 Jan 2015 13:21:16 +0000 (13:21 +0000)
commitba9cd54a57e5f69ca633541b0932513fa2cade0e
tree3a505df6a8bb4c4869b9abf753ae5cba7aa525ae
parent417f6673b4a7011280c82898226b773ec3506e12
parentdfe8dadf848448635ec4142d0d45f96fa839cf26
[dali_1.0.25] Merge branch 'tizen'

Change-Id: Id1510d67d4839ee6e780816253474b3c5e7aa376