[dali_1.0.32] Merge branch 'tizen' 97/36297/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 4 Mar 2015 16:11:13 +0000 (16:11 +0000)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 4 Mar 2015 16:11:13 +0000 (16:11 +0000)
Change-Id: Ia7e9da09e0af7ecfdd2920c4d9e8440a18959132


Trivial merge