diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-09-05 15:11:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-05 15:11:16 +0000 |
| commit | 6d0e95571afaba05adda00264287b22fbadf6c3e (patch) | |
| tree | d5d8afda55ebbeb886aebc62d0e0bbc6706fac79 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 88dc28c704e8c5377d7bee6bfa771cdea926c888 (diff) | |
| parent | 356f524578ef017eb3b56a4faccb24c4334b333c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5df84b4f36 -s ours am: 91e53f88c4 -s ours am: 568f7ec214 -s ours am: 356f524578 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1420413
Change-Id: Ic6cb9d74ed53df01960baf0edfff607b0a709ac2
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions