diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-04 23:13:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-04 23:13:14 +0000 |
| commit | 817bf1ad48e0c5ce1d527301aabed845dff2ff1b (patch) | |
| tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ecca49703521f3a6ea69527bed26d833fd88c372 (diff) | |
| parent | 4676897a5dbce3c916bee4c0fd351f3183e39e22 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 38735bca27 -s ours am: 7d6d2761df -s ours am: 2276d02b22 -s ours am: 4676897a5d -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420248
Change-Id: I90e02296fc0a432938d32441e4551251aaf40fcd
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions