am f11c52d2: Updates resulting from the Skia merge (revision 1327)

* commit 'f11c52d246d9e43c8533dff82979e7eeb72c1d50':
  Updates resulting from the Skia merge (revision 1327)
This commit is contained in:
Derek Sollenberger 2011-06-13 15:42:47 -07:00 committed by Android Git Automerger
commit e692f69ad3

Diff Content Not Available