[dali_1.0.4] Merge branch 'tizen' 91/25991/1
authorKingsley Stephens <k.stephens@partner.samsung.com>
Wed, 13 Aug 2014 14:21:10 +0000 (15:21 +0100)
committerKingsley Stephens <k.stephens@partner.samsung.com>
Wed, 13 Aug 2014 14:22:46 +0000 (15:22 +0100)
commit8acf677d1bcea0a2f6ce040d72edd3adce72293b
treead76a636de79fa1b82b654ba87990f87debf11ce
parentb707c27aa51f3dca50c16d78b89f058e0598021d
parent31e429bb82f49c521563cb5e9227cb309384177a
[dali_1.0.4] Merge branch 'tizen'

Change-Id: Ifb4f958c2b6803cad3c0867571820df80e6c1108