OSDN Git Service

am 2d7d3f78: (-s ours) am f247e545: Merge "Adapt to latest skia"
authorJean-Baptiste Queru <jbq@google.com>
Thu, 12 May 2011 22:54:13 +0000 (15:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 12 May 2011 22:54:13 +0000 (15:54 -0700)
* commit '2d7d3f78c90734c8067ab76b8f5daca84a311c92':
  Adapt to latest skia


Trivial merge