diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-18 04:49:00 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-18 04:49:00 +0000 |
| commit | 316c91af3fcb32381bbb1aae01aa384d2fe06d9d (patch) | |
| tree | 6c10601abb71570cefd2e6812e6e78e4e5f57515 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d1c9161d7a6804907a2471916b6a9c985229d44e (diff) | |
| parent | 1946bfb890f11bb09f3d5b1ebf8a56883fe56bb7 (diff) | |
[automerger skipped] Merge "Ignore resources from unknown types" am: e0f44eb6e7 am: a4bb7ab3b4 am: fda617812b am: 2a2720593f am: 1946bfb890 -s ours
am skip reason: Change-Id Ia3c0b4e07457eb8634b5a256ef77270e99b8bd72 with SHA-1 19e1a5b4c8 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1430090
Change-Id: Ia63b617d79577267cd76c727c157c31e8c55ca7b
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions