diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 05:56:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 05:56:51 +0000 |
| commit | 1577217d946990c89a185d1b5f9a8cfd15eedaf4 (patch) | |
| tree | 4ff56bde1d82e854b68b88e14125510cd2de0608 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | fba72fae752b1c310d5b4635026846c695c624a9 (diff) | |
| parent | 7dda65827646c307824e51fd08bbd870b09a107d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 39695933e7 -s ours am: a49c29bd17 -s ours am: b8da09b396 -s ours am: 38c8324fda -s ours am: 7dda658276 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420258
Change-Id: Ic219d8a2613199a8013caf8ae15aa82028d7d4d5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions