| commit | 5916564b832701f84a029a3b80cc0eacfb734d4e | [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 | 5948dea0d797fc138f1f70d257111af6e10aa6c9 | |
| parent | 63ebe61dc8de2658d60828139c99f26a014e94f9 [diff] | |
| parent | ac1cfab28187bd9b0c8c0a5b488893ee99c82b1a [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