| commit | 4c1f70db3dc37f818bdff09ec3e289b797acc397 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Fri Apr 24 17:43:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 24 17:43:38 2015 +0000 |
| tree | c329e7f39d3ab5dd5ecd7d5e05ab214e6cbc65df | |
| parent | 6db29a92452c2a837528d20d024dcacefd450c17 [diff] | |
| parent | b3523d7f8f8274a04145ca34eab9821aafb52d7a [diff] |
am b3523d7f: am 41c458c8: am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE * commit 'b3523d7f8f8274a04145ca34eab9821aafb52d7a': Make Bitmap_createFromParcel check the color count. DO NOT MERGE