diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-07 08:04:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-07 08:04:36 +0000 |
commit | f8d1546611b46ece4af54527cf865e1f04b2bf81 (patch) | |
tree | 683c2db6a8c334ed14821fce18e9e672498ed810 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 65a917dce90dabc9cda4863575a0794308f5fd79 (diff) | |
parent | 7a11b64a091b23a6b38eb2da20cff97841aa74de (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 9ade8130a6 -s ours am: 7a11b64a09 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12771094
Change-Id: I1ff151d554f4b3fa3e58239a75c72064ee80854a
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions