| commit | 85049e48c274e20e80d7a3f92e823a17d1d20b87 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Fri Apr 24 17:15:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 24 17:15:55 2015 +0000 |
| tree | 5948dea0d797fc138f1f70d257111af6e10aa6c9 | |
| parent | d03e6725a5c623ec2c6e2965d9991ceb7aabe604 [diff] | |
| parent | 9982dcfa5f19783e8cef4230b674ffa9dfc47088 [diff] |
am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE * commit '67326bcba0f7287367dedba4caaf2a168a43f057': Make Bitmap_createFromParcel check the color count. DO NOT MERGE