| commit | 67326bcba0f7287367dedba4caaf2a168a43f057 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Thu Apr 23 16:41:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 23 16:41:49 2015 +0000 |
| tree | 9e249b41c6fe8be388a7388d3ab71ed08f063117 | |
| parent | 16ac8ad7fac73524b5296f955884bd2aec405ded [diff] | |
| parent | ea2dcda788e035ccdc55ab16303c9e34740a3f8c [diff] |
am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE * commit 'ea2dcda788e035ccdc55ab16303c9e34740a3f8c': Make Bitmap_createFromParcel check the color count. DO NOT MERGE