tree 32ee852512d5bbad6b43b1c58a7ff1a94c970976
parent 4eed340935c1d4fdbfae58675b15097a83cb26fb
author tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1308942957 +0000
committer tomhudson@google.com <tomhudson@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1308942957 +0000

Fix bad merge which broke compiles.


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