diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-08-13 23:01:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-13 23:01:30 +0000 |
| commit | 7140b47d4d851702124384fcf5a7f8b007a98016 (patch) | |
| tree | 57b4c91f2c76701199848e2aa58704855b085409 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ddcdda9f4d8d0d610abfedca1935e4e3c0c7f7d9 (diff) | |
| parent | ee6d5268331553a99b7f780ca8306811f296eb97 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 7acc815b8e -s ours am: ee6d526833 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15542425
Change-Id: I904380032352ea9f5ba0fea6a8e6025b6f8db6d5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions