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


Trivial merge