| commit | 9982dcfa5f19783e8cef4230b674ffa9dfc47088 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Thu Apr 23 16:41:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 23 16:41:49 2015 +0000 |
| tree | e60b700e8d8ccd177392af36d73ab65ce32fbeb8 | |
| parent | 328fbf9c0317c8be8c85d8cdade46d435c739ef4 [diff] | |
| parent | 6a228c0eb765628193e960bf114f69d56979bed9 [diff] |
am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE * commit 'ea2dcda788e035ccdc55ab16303c9e34740a3f8c': Make Bitmap_createFromParcel check the color count. DO NOT MERGE