diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 07:23:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 07:23:16 +0000 |
| commit | b17c0b2654cd09e217f6751e383dcf5f5cf98ede (patch) | |
| tree | bee7682b401932290b0a8affa3cc0dc1a12c099b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 8a48949a091f64c1c356218467740f6a389aad9e (diff) | |
| parent | a3d3942140d28ce9a0875d17b4ff7a55bcac2c54 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 230452873e -s ours am: a3d3942140 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420411
Change-Id: Ib3ee874802eddeb100e8a47c80766055a6e18ffb
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions