tree ec962c0a38a8b254a1be1e37a658fdb7be231283
parent 20ccf13fbc685b96a8b1d4a59452143bec4fd711
parent cc8418fc5e323c8f2fed3cd7eb035b1c06db4992
author John Reck <jreck@google.com> 1430750827 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430750827 +0000

am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev

* commit 'cc8418fc5e323c8f2fed3cd7eb035b1c06db4992':
  Move AssetAtlas off of SkBitmap*