tree a261cac5a69ebbc5cf717395918b6e0cdf6cd0be
parent 40951a8cf149fe16d9806db32bbb9f109fd5f974
parent d698b563daeff1130d65f827f0fe54beb89e83cf
author Jean-Baptiste Queru <jbq@google.com> 1305239898 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1305239898 -0700

am f247e545: Merge "Adapt to latest skia"

* commit 'f247e545b521584bb778e79710c1e60ab814839e':
  Adapt to latest skia