diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-10-09 13:44:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-09 13:44:55 +0000 |
| commit | eb416f0256676df6502dba06b2ccf1b9579d17fc (patch) | |
| tree | 2ca2826b266ba1d3f15359ce85ee3aa21fa705ae /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 0bf28c0a9cc3c3d4ece7220dcdc06a1d19838f20 (diff) | |
| parent | 858fe168ed7debb0994420dc1c250a494b7df063 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: dae77669aa -s ours am: 858fe168ed -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12801147
Change-Id: I5b0ce88bd98ad475dc5df433126f7be8dc907e82
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions