[dali_1.0.21] Merge branch 'tizen' 78/31878/1
authorNick Holland <nick.holland@partner.samsung.com>
Thu, 11 Dec 2014 15:02:42 +0000 (15:02 +0000)
committerNick Holland <nick.holland@partner.samsung.com>
Thu, 11 Dec 2014 15:02:42 +0000 (15:02 +0000)
commit1a974725cb38e743fd9a613edad368a6dcd6249d
tree132c4e8a8a95b72a5cb1f1b11bafbeeedcd33e94
parentd46e06b577afa0f99a293d257a834add7c2f3755
parent5ff640b5fcdf3d931b7868223f842f0eebd03b5f
[dali_1.0.21] Merge branch 'tizen'

Change-Id: I57126741b8a9e031a7e9b038e0967b96c9a3189f