| commit | 41c458c81125fb6e3fc9eb5304f0d3216a0a2d74 | [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 | 2ec4181e373c36426542590a83d3c2d3426ee85c | |
| parent | 38cf068c04e1ce244529b95f6cc6d7d6a88fab24 [diff] | |
| parent | 67326bcba0f7287367dedba4caaf2a168a43f057 [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