diff options
| author | John Reck <jreck@google.com> | 2015-05-04 14:40:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-04 14:40:41 +0000 |
| commit | cc8418fc5e323c8f2fed3cd7eb035b1c06db4992 (patch) | |
| tree | 60759b9dd99d95622d61e78e8efef66a0af05e41 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7a560701fda09522c5da1212d5ad8e3d81780c7c (diff) | |
| parent | 1641c0cb0b6baf313c82846fe4f64007078c604f (diff) | |
am 1641c0cb: Merge "Move AssetAtlas off of SkBitmap*" into mnc-dev
* commit '1641c0cb0b6baf313c82846fe4f64007078c604f':
Move AssetAtlas off of SkBitmap*
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions