commit | cd9d69b9ce7eb301a9fd8d91b9f95fd99b07bae5 | [log] [tgz] |
---|---|---|
author | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Mon Mar 14 20:30:14 2011 +0000 |
committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | Mon Mar 14 20:30:14 2011 +0000 |
tree | 699c584b39fd1e30022bb05ce58dad15fcd9b4c7 | |
parent | 260db92d4975c50fd929399e8d6875a4c854cd5d [diff] |
Upstreaming changes from android. - fix compile warnings in the GPU code - upstream android specific code (ifdef protected) - fail gracefully when a custom allocator fails git-svn-id: http://skia.googlecode.com/svn/trunk@936 2bbb7eff-a529-9590-31e7-b0007b416f81