tree a89fb28f4276b600f5b3cfd2cf8a22d1396a02f5
parent 6f2f42d52a23de0bd639d5e4957331118ccc47b8
parent f79bcd2dd5d82376640661f50aa2e9237af7c02c
author Jean-Baptiste Queru <jbq@google.com> 1328566325 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328566325 -0800

am f79bcd2d: am 52da99fa: am a081c7b8: Merge "Skia API changes as a result of an update to the Skia library."

* commit 'f79bcd2dd5d82376640661f50aa2e9237af7c02c':
  Skia API changes as a result of an update to the Skia library.