diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-15 14:31:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-15 14:31:20 +0000 |
| commit | b2df14e7797526e2ff53d3632fc8a2c32285b6dc (patch) | |
| tree | 23904a6cb485961be30009a79198e8c8a2bf6feb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 18b74fc300a0b5ebf2251539ed97e97c29c5227e (diff) | |
| parent | 482a5edcc8894eb5dde4cde0b53a1ec9951807b2 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9d3c99d8d8 -s ours" into sc-dev am: 482a5edcc8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14981035
Change-Id: Ie0b4104335c5976f611afdd25ad284011186c0d3
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions