[dali_1.0.22] Merge branch 'tizen' 70/32470/1
authorKingsley Stephens <k.stephens@partner.samsung.com>
Thu, 18 Dec 2014 10:10:12 +0000 (10:10 +0000)
committerKingsley Stephens <k.stephens@partner.samsung.com>
Thu, 18 Dec 2014 10:10:13 +0000 (10:10 +0000)
commit5946aae736b80d1f152a5b6a52a85f3a9f23d3ac
treef711b851f829dcee2e2c88bde7213b41dd096d74
parent8ca28807aa182b4f3e9f2abc41d45162ed08ad99
parent806f7a33a4405e6414719f832f7cc8b271597c23
[dali_1.0.22] Merge branch 'tizen'

Change-Id: I45f858bd9b4673e19a1dc85dcc29f272c56ea4f1