am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to latest skia"

* commit '2d7d3f78c90734c8067ab76b8f5daca84a311c92':
  Adapt to latest skia
This commit is contained in:
Jean-Baptiste Queru 2011-05-12 15:54:13 -07:00 committed by Android Git Automerger
commit 194cda3d98

Diff Content Not Available