diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-06 03:54:41 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-06 03:54:41 +0000 |
| commit | 1150a52483b654c0b5ee69f4b908545cb70e3302 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 21adb47574862624995b10a9aaf28125a0ffc6f2 (diff) | |
| parent | b336e80b2c38624c9e80a85a7eea17970bebe583 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 8f2203e459 -s ours am: 9681f759e8 -s ours am: fe9f098df4 -s ours am: 96720f6f3f -s ours am: b336e80b2c -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420492
Change-Id: I4c439173186ac973cbaf1bd7542686ba41f9ed3c
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions