tree 4244625eb50b4615a8f9016ee17ae2afb09e57f3
parent 61eb040e2f18d367c66c0bfc08d2707dc75f7cf2
author djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1302874886 +0000
committer djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1302874886 +0000

Upstream android changes.

reviewed by: reed


git-svn-id: http://skia.googlecode.com/svn/trunk@1134 2bbb7eff-a529-9590-31e7-b0007b416f81