diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-12-06 16:15:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 16:15:32 +0000 |
| commit | c0ab918d545f0da7394d7c83bd34c89f8b462ae9 (patch) | |
| tree | 7652ac3d66acf9b55fe6815121dd2219e2c8716a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 38957d5fba1a40cf5368e0b06e440eb80f2b7428 (diff) | |
| parent | 0bf77bd9c66cff216426a15252fc72263f5aa3f0 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: a3a757c8dc -s ours am: 0bf77bd9c6 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1519352
Change-Id: Iebb52096885b1ac32487e1cffe3a316f8da84c87
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions