diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-04 00:14:11 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-04 00:14:11 +0000 |
| commit | 301657a18c9d50ba476015ded24eed0facfe3a36 (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 65a4de929020af9a107628763449545a065f9a4e (diff) | |
| parent | d22330d804ddffffa36aac4b0461ed9fb8f85cca (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: e67f8a3ca0 -s ours am: 275e3c5de8 -s ours" into rvc-qpr-dev-plus-aosp am: d22330d804 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12077344
Change-Id: Icb243af0b1d61e3eacb2030bbd2cd5fde1948a80
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions