[dali_1.0.2] Merge branch 'tizen' 10/25310/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 15:21:44 +0000 (16:21 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 15:21:50 +0000 (16:21 +0100)
commitdfafda92888739a4d302e3ff3e464c1156bd08b0
treeaf900840f6a47feedc40938096f1aa1cd7e8c1c2
parentb7bf4aba325e2325680747d2b3d898c7d41a86aa
parent0d95ef449783c0fe438d81b0021142a5f44ecd71
[dali_1.0.2] Merge branch 'tizen'

Change-Id: Ic01382971a3209f8cfabc035225789a0d984715d