diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-01-02 04:35:34 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-02 04:35:34 +0000 |
commit | 2718f5c4e6c61111e33d3a37872b5a8437a1a759 (patch) | |
tree | 67a919d4e86aedd38f002aabb2a2f1b3bddfbab5 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | bfe685b851ac19e630d84a2582e34825500b94a6 (diff) | |
parent | da2a87de8b3d97d0d19b0e4b7dec58250cccb0c5 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 418c665310 -s ours am: da2a87de8b -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13281946
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3b5646e466a40ee6153e2dc14e1dee1104d34eaf
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions