OSDN Git Service

am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
authorJohn Reck <jreck@google.com>
Mon, 4 May 2015 14:47:07 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 4 May 2015 14:47:07 +0000 (14:47 +0000)
* commit 'cc8418fc5e323c8f2fed3cd7eb035b1c06db4992':
  Move AssetAtlas off of SkBitmap*


Trivial merge