[dali_1.0.21] Merge branch 'tizen' 80/31880/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 11 Dec 2014 15:02:57 +0000 (15:02 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 11 Dec 2014 15:02:57 +0000 (15:02 +0000)
commit8ca28807aa182b4f3e9f2abc41d45162ed08ad99
treea8b37e36da804c151a716556b2fb67736c027d4e
parenta13474af714b2713c20c6f7966e3ec776bcc6d50
parentc4e366261947882968de0a13e51a3dd0d2f34e41
[dali_1.0.21] Merge branch 'tizen'

Change-Id: I4cf0e47c2c831e78c51e4d3e75b804e6d08cc4ef