[dali_1.0.20] Merge branch 'tizen' 85/31285/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 3 Dec 2014 12:31:04 +0000 (12:31 +0000)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 3 Dec 2014 12:42:29 +0000 (12:42 +0000)
Change-Id: I9f1aa3c8d2a030ac953ce7124d00bcf9083ed99d


Trivial merge