[dali_1.0.5] Merge branch 'tizen' 32/26332/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 20 Aug 2014 15:45:51 +0000 (16:45 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 20 Aug 2014 15:46:13 +0000 (16:46 +0100)
commit6ea848e5b8561680360328d6d3885b43b45cc2a4
tree70756eb2020f45a989123c8303fa71fd14adcfe4
parentca814b1aabaa38d1a748114dfa326c7eafc7d282
parent8bc1785be7b21290402d2c99c5a1bebbc3a70af6
[dali_1.0.5] Merge branch 'tizen'

Change-Id: If9ba312ec08080ba8c105d0b3c28678e898f518b
Signed-off-by: Lee Morgan <Lee.morgan@partner.samsung.com>