diff options
| author | Leon Scroggins III <scroggo@google.com> | 2015-04-23 16:29:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-23 16:29:22 +0000 |
| commit | ea2dcda788e035ccdc55ab16303c9e34740a3f8c (patch) | |
| tree | 4114f8712ae25f97d08389ad5c66629dabefd049 /rs/java/android/renderscript/Program.java | |
| parent | 4a6ca6724c789603626d74a8cc187365788a6cfd (diff) | |
| parent | ee35410ff8297b1ab39f3e546ebcedc27300a7de (diff) | |
am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit 'ee35410ff8297b1ab39f3e546ebcedc27300a7de':
Make Bitmap_createFromParcel check the color count. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions