diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 05:26:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 05:26:19 +0000 |
| commit | eb4a9ae37b5785bc5863851a6218350c8ef26bb4 (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 18dee2278cc3022d9102a8d6331e3cf7063d427b (diff) | |
| parent | 6ab87158b56e542e5ada0fd26cd43c4f12b971fe (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: b3ea91190e -s ours am: 6ab87158b5 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420408
Change-Id: Ib719086579f3bb0a4b5de6ebb216dc1b7ba0da96
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions