Merge r10804 from trunk to branches/chrome/m30_1599

git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/gyp@10962 2bbb7eff-a529-9590-31e7-b0007b416f81
1 file changed