| commit | 08a7c50cbe091a3c43550101c4ab9ead8d4376ec | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Fri Apr 24 18:21:53 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 24 18:21:53 2015 +0000 |
| tree | c2b20d60f3da04f096312c1dd6374df8303138de | |
| parent | 1db13a90108312531bffbae94c7aeadaf2826a49 [diff] | |
| parent | 38b84b6d765302c8325ad10109e43227ce8e8156 [diff] |
am 38b84b6d: (-s ours) am 60d7c9fc: am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE * commit '38b84b6d765302c8325ad10109e43227ce8e8156': Make Bitmap_createFromParcel check the color count. DO NOT MERGE