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