diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-06 02:54:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-06 02:54:43 +0000 |
commit | fe9f098df47cbd52362d0e455ac8284362caa5af (patch) | |
tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 89a0cae9f9009272f592a318d114a9f5b5003c0f (diff) | |
parent | 9681f759e84592265ffcea6e2339e92758f3dc7d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8f2203e459 -s ours am: 9681f759e8 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420492
Change-Id: I8462a54a9c3106aac549698cc684fc72a97ceb92
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions