Snapshot from http://skia.googlecode.com/svn/trunk@6890

Change-Id: I40c1c8a08cc39102fe9f8b3f116206be17db12e2
677 files changed