diff options
| author | Leon Scroggins <scroggo@google.com> | 2020-09-16 23:23:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-16 23:23:36 +0000 |
| commit | 3ca9f93b378c950d8c9cea50e6a870dfdacbfa60 (patch) | |
| tree | 5dfdb41b582a0bb56a58ab83b42f4e56239a2ec4 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c36eb5a15bd26fe9cb749da60a02bac1a50bbc38 (diff) | |
| parent | 04573f24a7f6ff37e8abf6229f1d4d308bf64eb9 (diff) | |
[automerger skipped] Merge "ImageDecoder: Use AssetFileDescriptor's length" am: efca2d56f1 am: 3a62413c4f am: b9d7c9ec52 am: 226c477959 am: 04573f24a7 -s ours
am skip reason: Change-Id I8d8e520f43a7ef0d7e4534ef165d8c7e4d2a0b55 with SHA-1 c3fda89b05 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426968
Change-Id: I5208a451f5b04fb26657e44c89ecf1f1562d31a7
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions