[dali_1.0.2] Merge branch 'tizen' 06/25306/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 15:02:09 +0000 (16:02 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 1 Aug 2014 15:02:13 +0000 (16:02 +0100)
commit2df7fd252f53d9bce8d938bc15c04449a72f9389
tree6ef6f0767354da36eced7afbe905a508ceb8dd35
parent04d259d0d3443165b0d750b0998ef13c83222543
parent36263156a28863a5f843c741965107bf376f72ca
[dali_1.0.2] Merge branch 'tizen'

Change-Id: I9d0dc43de965f34f42dbcfcbc0e332609c07e7cd