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