diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 14:20:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 14:20:36 +0000 |
| commit | 89a0cae9f9009272f592a318d114a9f5b5003c0f (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2beaafda59c099b3372e1344bd2a99a11686d141 (diff) | |
| parent | 47c1d3f7a8dafe650a7385d529b42ad729bbd12b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8d9e8ba822 -s ours am: 47c1d3f7a8 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420421
Change-Id: I4593dd2065eeb9fcc347f5be22d08bd0cfe5e731
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions