| commit | ff0bae7dbc24afb24bc712fd742ca1e6243e7966 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Fri Apr 24 18:22:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 24 18:22:00 2015 +0000 |
| tree | c2b20d60f3da04f096312c1dd6374df8303138de | |
| parent | 08a7c50cbe091a3c43550101c4ab9ead8d4376ec [diff] | |
| parent | fddbcd857fda28213917ef81375514bffc4a6d68 [diff] |
am fddbcd85: (-s ours) am 8be18bbf: am 4c1f70db: am b3523d7f: 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 'fddbcd857fda28213917ef81375514bffc4a6d68': Make Bitmap_createFromParcel check the color count. DO NOT MERGE