diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-12 10:32:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-06-12 10:32:34 +0000 |
| commit | c171b98c5087f04be50cf3ce85b2f7b0575dca72 (patch) | |
| tree | 6b7594a8a9f46a14f1c08e1f4fed110792cdff0a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | c92f6454623b62bc13db4cfc3735b364dc9ad7f4 (diff) | |
| parent | 1319f44dae5f9ca854dea4f789688c0e123adb2e (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8a0b3854ca -s ours" into sc-dev am: 1319f44dae -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14946274
Change-Id: I55dda84fa70817038db8a6148534b388a0254567
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions