OSDN Git Service

am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev
authorLeon Scroggins III <scroggo@google.com>
Thu, 6 Mar 2014 19:49:58 +0000 (19:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Mar 2014 19:49:58 +0000 (19:49 +0000)
commit8d3281f5f7a880b996e50d291ebb7154a486eb6c
treece2df832edfe7b3d7c53e6049cb8a2f872b284ef
parenteac19754ca0822e4c1c50c436affbf5cbf7e08d3
parentee008d4264a95bba5f90b17856fc06fa29a6f12c
am ee008d42: Merge "Update framework to use M33 Skia. DO NOT MERGE" into klp-dev

* commit 'ee008d4264a95bba5f90b17856fc06fa29a6f12c':
  Update framework to use M33 Skia. DO NOT MERGE
graphics/java/android/graphics/Bitmap.java
graphics/java/android/graphics/BitmapFactory.java