diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 01:35:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 01:35:15 +0000 |
| commit | c97a19e701c603dc3795e5221905bc77afdc21bd (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7611af2d645b2b8fa6e731e32a86c83e17c88a64 (diff) | |
| parent | 7e59631036a63a0fba81d943699984a44fdf9f47 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 59abb4f816 -s ours am: 93fb60e626 -s ours am: 5481fa7837 -s ours am: d1ed3db8a0 -s ours am: 7e59631036 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420249
Change-Id: Idd5b035a4dcf546f93a1386395938748b3804d24
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions