diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-06 04:08:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-06 04:08:45 +0000 |
| commit | f0f2c2bd4864f6904f01cbbc3f81c2c9cf91a7bb (patch) | |
| tree | e615cd3b4c13ab0fd50e03570b44d138f9bde810 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 2da1c2d66c9e91eb1b689c7db778a94897e3d2bf (diff) | |
| parent | 44e090521d136613181cc3e40ab00d7879268ff9 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: c50e295c82 -s ours am: 44e090521d -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13173637
Change-Id: I064eeab7c759fc571b2dc34cb694beb9c6dedd52
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions