| commit | b3523d7f8f8274a04145ca34eab9821aafb52d7a | [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 | 07e5a04bb30fb15702ea0240e84f3358b84c7a64 | |
| parent | f828f43f97f4a018e2224e926b900713081a8c5b [diff] | |
| parent | 41c458c81125fb6e3fc9eb5304f0d3216a0a2d74 [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