diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 22:16:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 22:16:44 +0000 |
| commit | 6f237689e75da1b8dee0c31f2c83eb158d1457b2 (patch) | |
| tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c17e172a6b229d69a8681149dc20e310a04b6745 (diff) | |
| parent | be2ff78d5806ceb872059fcfe7865f0b755ab937 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 865d3f1922 -s ours am: 1259eaa42f -s ours am: be2ff78d58 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420159
Change-Id: Idf12ade4f0cea948a791abc71d3af20284b6451f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions