tree e18a4fe402fa6f1f49a0c28a4a56c8164df763e5
parent ff75ef8f1c064f6456ba8dde10b62c2b9ec4818d
parent 87ffb63d90fb6dd2689fe72dcb24fda9a6156220
author John Reck <jreck@google.com> 1429132998 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1429132999 +0000

Merge "Move AssetAtlas off of SkBitmap*"