Commits
John Reck authored and Android Git Automerger committed dd447382cd2M
am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev * commit 'cc8418fc5e323c8f2fed3cd7eb035b1c06db4992': Move AssetAtlas off of SkBitmap*
Showing diff to20ccf13fbc6