[dali_1.0.18] Merger branch 'tizen' 77/30577/1
authorXiangyin Ma <x1.ma@samsung.com>
Thu, 20 Nov 2014 13:15:37 +0000 (13:15 +0000)
committerXiangyin Ma <x1.ma@samsung.com>
Thu, 20 Nov 2014 13:16:27 +0000 (13:16 +0000)
commitba3532286369da665dcf46d7c3260b178edb8b5b
treea5a8152dbf5982a375f44a57c0082b5f06af34e7
parent1846ed9e60412dbb8aab06aa6bd7c0027d242ac0
parenta2cff199363167030d0d9d4af49749c6d23670b0
[dali_1.0.18] Merger branch 'tizen'

Change-Id: I14aba7dfd281128a036519aeb5293ea02b06704a