tree 18006613a412171f7b15931e71b2624169396d7a
parent 1558d68b5c2d0d1734d5fe30ce90cbf0bc68d056
author reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1355345298 +0000
committer reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> 1355345298 +0000

revert 6766, thereby re-landing 6762-6763 now that the bots are ready


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