| commit | ac1cfab28187bd9b0c8c0a5b488893ee99c82b1a | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Fri Apr 24 17:33:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 24 17:33:04 2015 +0000 |
| tree | c9d7ba376675ce9bcef42604cf104efd33acce1c | |
| parent | 6c487e9f723f8673f6531dbadc636937dde3d0a3 [diff] | |
| parent | 85049e48c274e20e80d7a3f92e823a17d1d20b87 [diff] |
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 '41c458c81125fb6e3fc9eb5304f0d3216a0a2d74': Make Bitmap_createFromParcel check the color count. DO NOT MERGE