diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 15:22:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 15:22:12 +0000 |
| commit | 5712c54098ed1b9f4cc42ce0a2742ef7f454d805 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a1ec6f904ec2cd89fbb2e8af3f084a57305d2aa8 (diff) | |
| parent | ea4001c008a0efb638db43364abe9862e754bf4a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 4d541332f9 -s ours am: d2b82ac688 -s ours am: 3ebfd0e7e9 -s ours am: 3330dc7d38 -s ours am: ea4001c008 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420419
Change-Id: Ia1501a9789e645ae1ea6ed7fdfa914713d9c0600
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions