diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 22:17:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 22:17:06 +0000 |
| commit | f1cc501f11729a80bb14b3c2e9629d9f971ae1af (patch) | |
| tree | c9e5cc728e671a5de21b72d7c756453b05db63ef /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6f237689e75da1b8dee0c31f2c83eb158d1457b2 (diff) | |
| parent | 75ddc2ed192b46ec8368aca054fe84580e3d3217 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f4d3fdd55f -s ours am: 61d51b2ec3 -s ours am: 75ddc2ed19 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420158
Change-Id: I8a5923d2a9f7bc2e53a1a206dceb060335e5b700
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions