tree c013d373810dd76bce4d428b1d5edee632ea08ed
parent 1d89c93b2a61a9679f444b19b6fce4325ae7df65
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1340825609 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1340825609 +0000

land https://codereview.appspot.com/6349043/


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