OSDN Git Service

am 8d3281f5: (-s ours) am ee008d42: Merge "Update framework to use M33 Skia. DO NOT...
authorLeon Scroggins III <scroggo@google.com>
Thu, 6 Mar 2014 20:06:14 +0000 (20:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Mar 2014 20:06:14 +0000 (20:06 +0000)
* commit '8d3281f5f7a880b996e50d291ebb7154a486eb6c':
  Update framework to use M33 Skia. DO NOT MERGE


Trivial merge