[dali_1.0.40] Merge branch 'tizen' 73/38873/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 29 Apr 2015 14:34:33 +0000 (15:34 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Wed, 29 Apr 2015 14:34:33 +0000 (15:34 +0100)
commitd924a32ada869dd2f493bccf4224226593773e16
treed14b4399f9e2bddc5adbdbaa1509d30646d47454
parent6a51fca768ccd75d552b73c0a67056721dc86e44
parent879626d195e3cfe20f925c6ae6b37f453461b8ee
[dali_1.0.40] Merge branch 'tizen'

Change-Id: Id5d66af57d1a6803a874da82265bd5f08eedf4b7