| commit | dd447382cd2a1fb81b5d6607d25fed2c76fcd9e5 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Mon May 04 14:47:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 04 14:47:07 2015 +0000 |
| tree | ec962c0a38a8b254a1be1e37a658fdb7be231283 | |
| parent | 20ccf13fbc685b96a8b1d4a59452143bec4fd711 [diff] | |
| parent | cc8418fc5e323c8f2fed3cd7eb035b1c06db4992 [diff] |
am cc8418fc: am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev * commit 'cc8418fc5e323c8f2fed3cd7eb035b1c06db4992': Move AssetAtlas off of SkBitmap*