diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 05:57:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 05:57:27 +0000 |
| commit | f1ce0899ede2a5db18b73618b65cc2c2da7552a9 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 1577217d946990c89a185d1b5f9a8cfd15eedaf4 (diff) | |
| parent | e30890a402e963de7b7fd380e8d8536efbeb4ee8 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5e2016da9a -s ours am: 66a625cfcf -s ours am: a94d9958db -s ours am: 7be4ab0f9d -s ours am: e30890a402 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420263
Change-Id: I2b203fe66a595135f5c4b82e4e47e6a2300f62f4
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions