diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-02 04:30:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-02 04:30:20 +0000 |
| commit | 8aafe1b3d9a191316f2da3a425509749deb05c1c (patch) | |
| tree | 3d32c0aca4119a3e2f53495d93af28de453ed26e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 927d4dc3c735d3ec3040c4c7d8d9051b1550b350 (diff) | |
| parent | 49a17ddcfdc42450fb2886a840fdab2aa6eb1378 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 7b26ef1fb6 -s ours am: 49a17ddcfd -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1539149
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8f69f39f23f5a120686226cb19d9a7fa48fbfc08
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions