diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-06 23:51:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-06 23:51:59 +0000 |
commit | 65ac105f639a46f25c343443d34260ead92b5b1e (patch) | |
tree | 6056d73e9c6ed49b9c6fd9b1bbfe3563bc487e53 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 967d9418255b272edfb35bf9df2c2124c2d32ec5 (diff) | |
parent | c56f90df74473243d527aa1adc6712adeefc9be0 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: b82ba472f7 -s ours am: 861c8740b8 -s ours am: c56f90df74 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12321109
Change-Id: I40f86ac89a239e723e26171b3786276365475d14
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions