am f247e545: Merge "Adapt to latest skia"

* commit 'f247e545b521584bb778e79710c1e60ab814839e':
  Adapt to latest skia
This commit is contained in:
Jean-Baptiste Queru 2011-05-12 15:38:18 -07:00 committed by Android Git Automerger
commit d6c51aef6b

Diff Content Not Available