tree fa69c4b77dce4c9d50c93757211c4830c19f899c
parent be09298eb708f6acb6af7028fbca28afdf230008
parent a081c7b8bc5a3ea19fc7562b333fac525b17bc5f
author Jean-Baptiste Queru <jbq@google.com> 1328566051 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1328566051 -0800

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

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